diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2006-01-03 18:54:08 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2006-01-03 18:54:08 +0000 |
| commit | 4e2b128bb034c18f31c42037af3e1abd549affd5 (patch) | |
| tree | e144a9f29da26915b931543ca648f5eb2946c666 | |
| parent | c33efe81b7f64961d826b23a9b2b847ea25f065d (diff) | |
include signal.h not sys/signal.h and remove a useless cast; OK deraadt@
| -rw-r--r-- | usr.sbin/portmap/portmap.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c index 9f4506d6362..d10b0c690fa 100644 --- a/usr.sbin/portmap/portmap.c +++ b/usr.sbin/portmap/portmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: portmap.c,v 1.34 2005/05/22 21:19:39 henning Exp $ */ +/* $OpenBSD: portmap.c,v 1.35 2006/01/03 18:54:07 millert Exp $ */ /*- * Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved. @@ -40,7 +40,7 @@ char copyright[] = #if 0 static char sccsid[] = "from: @(#)portmap.c 5.4 (Berkeley) 4/19/91"; #else -static char rcsid[] = "$OpenBSD: portmap.c,v 1.34 2005/05/22 21:19:39 henning Exp $"; +static char rcsid[] = "$OpenBSD: portmap.c,v 1.35 2006/01/03 18:54:07 millert Exp $"; #endif #endif /* not lint */ @@ -83,8 +83,18 @@ static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro"; * Mountain View, California 94043 */ +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <sys/wait.h> +#include <sys/resource.h> + +#include <rpcsvc/nfs_prot.h> +#include <arpa/inet.h> #include <rpc/rpc.h> #include <rpc/pmap_prot.h> + +#include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -93,13 +103,6 @@ static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro"; #include <netdb.h> #include <pwd.h> #include <errno.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/wait.h> -#include <sys/signal.h> -#include <sys/resource.h> -#include <rpcsvc/nfs_prot.h> -#include <arpa/inet.h> void reg_service(struct svc_req *, SVCXPRT *); void reap(int); @@ -262,7 +265,7 @@ main(int argc, char *argv[]) exit(1); } - (void)signal(SIGCHLD, (void (*)(int))reap); + (void)signal(SIGCHLD, reap); svc_run(); syslog(LOG_ERR, "svc_run returned unexpectedly"); abort(); |