aboutsummaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/comm.c1
-rw-r--r--src/cmd/ed.c1
-rw-r--r--src/cmd/import.c2
3 files changed, 1 insertions, 3 deletions
diff --git a/src/cmd/comm.c b/src/cmd/comm.c
index cce02ffc..00cc03b5 100644
--- a/src/cmd/comm.c
+++ b/src/cmd/comm.c
@@ -93,7 +93,6 @@ main(int argc, char *argv[])
continue;
}
}
- exits(0);
}
int
diff --git a/src/cmd/ed.c b/src/cmd/ed.c
index 3af90f6f..0b4be590 100644
--- a/src/cmd/ed.c
+++ b/src/cmd/ed.c
@@ -758,7 +758,6 @@ gety(void)
if(p >= &linebuf[LBSIZE-2])
error(Q);
}
- return 0;
}
int
diff --git a/src/cmd/import.c b/src/cmd/import.c
index f084b8e6..456f663d 100644
--- a/src/cmd/import.c
+++ b/src/cmd/import.c
@@ -243,7 +243,7 @@ shuffle(void *arg)
if(tbuf == nil)
tbuf = emalloc(BLEN+1);
memmove(tbuf, buf, n); // because convM2S is destructive
- if(convM2S(tbuf, n, t) != n)
+ if(convM2S((uchar*)tbuf, n, t) != n)
fprint(dfd, "%d->%d convert error in convM2S", fd[0], fd[1]);
else
fprint(dfd, "%d->%d %F\n", fd[0], fd[1], t);