diff options
author | charnier <charnier@FreeBSD.org> | 2003-07-06 10:37:00 +0000 |
---|---|---|
committer | charnier <charnier@FreeBSD.org> | 2003-07-06 10:37:00 +0000 |
commit | 0ad2e8b8058acc93dee5015a14089e6dc55f22e7 (patch) | |
tree | 1c8e758d02bd10976d8889b968f9146149783b1e /usr.sbin | |
parent | 2ced154094b1ba76e51108eff45803f60f6731ce (diff) | |
download | FreeBSD-src-0ad2e8b8058acc93dee5015a14089e6dc55f22e7.zip FreeBSD-src-0ad2e8b8058acc93dee5015a14089e6dc55f22e7.tar.gz |
de-__P
use port/proto to represent services (not proto/port).
add FBSDID
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/rwhod/rwhod.c | 14 | ||||
-rw-r--r-- | usr.sbin/timed/timed/timed.c | 19 | ||||
-rw-r--r-- | usr.sbin/timed/timedc/cmds.c | 17 |
3 files changed, 26 insertions, 24 deletions
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 3c68993..96514be 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -37,13 +37,14 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint #if 0 +#ifndef lint static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/socket.h> @@ -163,8 +164,7 @@ int verify(char *, int); static void usage(void); #ifdef DEBUG char *interval(int, char *); -void Sendto __P((int, const void *, size_t, int, - const struct sockaddr *, int)); +void Sendto(int, const void *, size_t, int, const struct sockaddr *, int); #define sendto Sendto #endif @@ -217,7 +217,7 @@ main(int argc, char *argv[]) openlog("rwhod", LOG_PID, LOG_DAEMON); sp = getservbyname("who", "udp"); if (sp == NULL) { - syslog(LOG_ERR, "udp/who: unknown service"); + syslog(LOG_ERR, "who/udp: unknown service"); exit(1); } if (chdir(_PATH_RWHODIR) < 0) { diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c index 2daadb1..27344a3 100644 --- a/usr.sbin/timed/timed/timed.c +++ b/usr.sbin/timed/timed/timed.c @@ -37,13 +37,14 @@ static const char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#ifndef lint #if 0 +#ifndef lint static char sccsid[] = "@(#)timed.c 8.1 (Berkeley) 6/6/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #define TSPTYPES #include "globals.h" @@ -93,10 +94,10 @@ static struct goodhost { /* hosts that we trust */ } *goodhosts; static char *goodgroup; /* net group of trusted hosts */ -static void checkignorednets __P((void)); -static void pickslavenet __P((struct netinfo *)); -static void add_good_host __P((char *, int)); -static void usage __P((void)); +static void checkignorednets(void); +static void pickslavenet(struct netinfo *); +static void add_good_host(char *, int); +static void usage(void); /* * The timedaemons synchronize the clocks of hosts in a local area network. @@ -216,7 +217,7 @@ main(argc, argv) srvp = getservbyname("timed", "udp"); if (srvp == 0) - errx(1, "unknown service 'timed/udp'"); + errx(1, "timed/udp: unknown service"); port = srvp->s_port; bzero(&server, sizeof(struct sockaddr_in)); server.sin_port = srvp->s_port; diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c index 35cc872..c6d6f07 100644 --- a/usr.sbin/timed/timedc/cmds.c +++ b/usr.sbin/timed/timedc/cmds.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "timedc.h" #include <sys/file.h> @@ -188,7 +189,7 @@ clockdiff(argc, argv) /* get the address for the date ready */ sp = getservbyname(DATE_PORT, DATE_PROTO); if (!sp) { - warnx("%s/%s is an unknown service", DATE_PORT, DATE_PROTO); + warnx("%s/%s: unknown service", DATE_PORT, DATE_PROTO); dayaddr.sin_port = 0; } else { dayaddr.sin_port = sp->s_port; @@ -287,7 +288,7 @@ msite(argc, argv) srvp = getservbyname("timed", "udp"); if (srvp == 0) { - warnx("udp/timed: unknown service"); + warnx("timed/udp: unknown service"); return; } dest.sin_port = srvp->s_port; @@ -390,7 +391,7 @@ testing(argc, argv) srvp = getservbyname("timed", "udp"); if (srvp == 0) { - warnx("udp/timed: unknown service"); + warnx("timed/udp: unknown service"); return; } @@ -446,7 +447,7 @@ tracing(argc, argv) srvp = getservbyname("timed", "udp"); if (srvp == 0) { - warnx("udp/timed: unknown service"); + warnx("timed/udp: unknown service"); return; } dest.sin_port = srvp->s_port; |