summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-05-26 01:21:13 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-05-26 01:21:13 +0000
commit0eb5bf872087d10dc67b98421ccddbadd0461f8b (patch)
tree02fc6ba809692449c2c0f248289a437f4f83ddd2
parentbb034878f7ad38088dc2a0533ad4990f6ce5575d (diff)
pid_t cleanup; itojun ok
-rw-r--r--usr.sbin/faithd/faithd.c4
-rw-r--r--usr.sbin/faithd/tcp.c4
-rw-r--r--usr.sbin/ndp/ndp.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index 0ce09b3719a..cbfbb09faff 100644
--- a/usr.sbin/faithd/faithd.c
+++ b/usr.sbin/faithd/faithd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: faithd.c,v 1.19 2002/05/09 14:12:17 itojun Exp $ */
+/* $OpenBSD: faithd.c,v 1.20 2002/05/26 01:21:12 deraadt Exp $ */
/* $KAME: faithd.c,v 1.50 2002/05/09 14:06:52 itojun Exp $ */
/*
@@ -765,7 +765,7 @@ sig_child(int sig)
while ((pid = wait3(&status, WNOHANG, (struct rusage *)0)) > 0) {
if (pid && WEXITSTATUS(status))
syslog_r(LOG_WARNING, &sdata,
- "child %d exit status 0x%x", pid, status);
+ "child %ld exit status 0x%x", (long)pid, status);
}
errno = save_errno;
diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c
index 86058322b43..3f2b76ee4a6 100644
--- a/usr.sbin/faithd/tcp.c
+++ b/usr.sbin/faithd/tcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp.c,v 1.10 2002/02/16 21:28:02 millert Exp $ */
+/* $OpenBSD: tcp.c,v 1.11 2002/05/26 01:21:12 deraadt Exp $ */
/* $KAME: tcp.c,v 1.6 2001/07/02 14:36:49 itojun Exp $ */
/*
@@ -99,7 +99,7 @@ sig_child(int sig)
pid = wait3(&status, WNOHANG, (struct rusage *)0);
if (pid > 0 && WEXITSTATUS(status))
syslog_r(LOG_WARNING, &sdata,
- "child %d exit status 0x%x", pid, status);
+ "child %ld exit status 0x%x", (long)pid, status);
exit_success("terminate connection due to child termination");
}
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 6cc7c9fc005..685d7294876 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ndp.c,v 1.14 2002/02/17 19:42:38 millert Exp $ */
+/* $OpenBSD: ndp.c,v 1.15 2002/05/26 01:21:12 deraadt Exp $ */
/* $KAME: ndp.c,v 1.69 2001/07/23 14:46:31 itojun Exp $ */
/*
@@ -127,7 +127,7 @@
((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
-static int pid;
+static pid_t pid;
static int cflag;
static int nflag;
static int tflag;