summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-05-26 09:27:12 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-05-26 09:27:12 +0000
commit83a6c6911f8ace4bb28af6cf0f98e8a40cab9848 (patch)
tree7ddd86a1b5337950ae819cb9ddb24ee495862b1d
parent6aa6edb00aa211e3677bbe83a79f77a698463a78 (diff)
pid_t cleanup
-rw-r--r--usr.bin/time/time.c6
-rw-r--r--usr.bin/wall/ttymsg.c7
2 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index f240cae5759..51d90ee646c 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: time.c,v 1.12 2002/02/16 21:27:55 millert Exp $ */
+/* $OpenBSD: time.c,v 1.13 2002/05/26 09:27:10 deraadt Exp $ */
/* $NetBSD: time.c,v 1.7 1995/06/27 00:34:00 jtc Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: time.c,v 1.12 2002/02/16 21:27:55 millert Exp $";
+static char rcsid[] = "$OpenBSD: time.c,v 1.13 2002/05/26 09:27:10 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -70,7 +70,7 @@ main(argc, argv)
int argc;
char **argv;
{
- int pid;
+ pid_t pid;
int ch, status;
struct timeval before, after;
struct rusage ru;
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 859ad83907a..1fb6194eee4 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttymsg.c,v 1.9 2001/11/19 19:02:17 mpech Exp $ */
+/* $OpenBSD: ttymsg.c,v 1.10 2002/05/26 09:27:11 deraadt Exp $ */
/* $NetBSD: ttymsg.c,v 1.3 1994/11/17 07:17:55 jtc Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93";
#endif
-static const char rcsid[] = "$OpenBSD: ttymsg.c,v 1.9 2001/11/19 19:02:17 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: ttymsg.c,v 1.10 2002/05/26 09:27:11 deraadt Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -139,7 +139,8 @@ ttymsg(iov, iovcnt, line, tmout)
continue;
}
if (errno == EWOULDBLOCK) {
- int cpid, off = 0;
+ int off = 0;
+ pid_t cpid;
if (forked) {
(void) close(fd);