ansify

8 files changed, 30 insertions, 43 deletions

diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index c3da4ceac72..533aa80fc8d 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: measure.c,v 1.9 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: measure.c,v 1.10 2003/06/12 21:09:48 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -58,11 +58,8 @@ static n_short seqno = 0;
  * ICMP timestamp messages.
  */
 int					/* status val defined in globals.h */
-measure(u_long maxmsec,			/* wait this many msec at most */
-	u_long wmsec,			/* msec to wait for an answer */
-	char *hname,
-	struct sockaddr_in *addr,
-	int print)			/* print complaints on stderr */
+measure(u_long maxmsec, u_long wmsec, char *hname, struct sockaddr_in *addr,
+    int print)
 {
 	socklen_t length;
 	int measure_status;
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index 47cd202f16e..4c70ba499f5 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: networkdelta.c,v 1.6 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: networkdelta.c,v 1.7 2003/06/12 21:09:48 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -60,7 +60,7 @@ static long median(float, float*, long*, long*, unsigned int);
  *	bad values.
  */
 long
-networkdelta()
+networkdelta(void)
 {
 	struct hosttbl *htp;
 	long med;
@@ -146,10 +146,7 @@ networkdelta()
  *	in <<Numerical Recipes>>.
  */
 static long
-median(float a,				/* initial guess for the median */
-       float *eps_ptr,			/* spacing near the median */
-       long *x, long *xlim,		/* the data */
-       unsigned int gnuf)		/* good enough estimate */
+median(float a, float *eps_ptr, long *x, long *xlim, unsigned int gnuf)
 {
 	long *xptr;
 	float ap = LONG_MAX;		/* bounds on the median */
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index a28f6c6084e..be36e13d3e1 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readmsg.c,v 1.12 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: readmsg.c,v 1.13 2003/06/12 21:09:48 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -69,7 +69,7 @@ struct timeval from_when;
 
 struct tsp *
 readmsg(int type, char *machfrom, struct timeval *intvl,
-	struct netinfo *netfrom)
+    struct netinfo *netfrom)
 {
 	int length;
 	socklen_t salength;
@@ -333,7 +333,7 @@ again:
  * only the type ACK is to be sent by a slave
  */
 void
-slaveack()
+slaveack(void)
 {
 	switch(msgin.tsp_type) {
 
@@ -365,7 +365,7 @@ slaveack()
  * These packets should be acknowledged.
  */
 void
-ignoreack()
+ignoreack(void)
 {
 	switch(msgin.tsp_type) {
 
@@ -393,7 +393,7 @@ ignoreack()
  * to the messages received by a master
  */
 void
-masterack()
+masterack(void)
 {
 	struct tsp resp;
 
@@ -436,9 +436,7 @@ masterack()
  * Print a TSP message
  */
 void
-print(msg, addr)
-struct tsp *msg;
-struct sockaddr_in *addr;
+print(struct tsp *msg, struct sockaddr_in *addr)
 {
 	char tm[26];
 	time_t msgtime;
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index 587a3aa1b21..d1351c4362d 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slave.c,v 1.8 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: slave.c,v 1.9 2003/06/12 21:09:48 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -54,7 +54,7 @@ static void setmaster(struct tsp *);
 static void answerdelay(void);
 
 int
-slave()
+slave(void)
 {
 	int tries;
 	long electiontime, refusetime, looktime, looptime, adjtime;
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index 41fa6cd3187..82b0a078f38 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timed.c,v 1.18 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: timed.c,v 1.19 2003/06/12 21:09:48 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -606,7 +606,7 @@ lookformaster(struct netinfo *ntp)
  * networks;
  */
 void
-setstatus()
+setstatus(void)
 {
 	struct netinfo *ntp;
 
@@ -725,7 +725,7 @@ casual(long inf, long sup)
 }
 
 char *
-date()
+date(void)
 {
 	struct	timeval tv;
 	time_t t;
@@ -854,7 +854,7 @@ good_host_name(const char *name)
 }
 
 static void
-usage()
+usage(void)
 {
 	(void)fprintf(stderr, "timed: [-dtM] [-i net|-n net] "
 	    "[-F host1 host2 ...] [-G netgp]\n");
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index e277649ded7..8fb3be6ce7c 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.16 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.17 2003/06/12 21:09:48 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -34,7 +34,7 @@ static char sccsid[] = "@(#)cmds.c	5.1 (Berkeley) 5/11/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.16 $"
+#ident "$Revision: 1.17 $"
 #endif
 
 #include "timedc.h"
@@ -179,9 +179,7 @@ bail:
  * measurement.
  */
 void
-clockdiff(argc, argv)
-	int argc;
-	char *argv[];
+clockdiff(int argc, char *argv[])
 {
 	struct servent *sp;
 	long avg;
@@ -398,7 +396,7 @@ bail:
  * quits timedc
  */
 void
-quit()
+quit(void)
 {
 	exit(0);
 }
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 74190ae57ba..6233dbe0efd 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timedc.c,v 1.9 2003/06/02 23:36:55 millert Exp $	*/
+/*	$OpenBSD: timedc.c,v 1.10 2003/06/12 21:09:48 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -155,8 +155,7 @@ main(int argc, char *argv[])
 }
 
 void
-sigintr(signo)
-	int signo;
+sigintr(int signo)
 {
 	if (!fromatty)
 		_exit(0);
@@ -198,7 +197,7 @@ getcmd(char *name)
  * Slice a string up into argc/argv.
  */
 void
-makeargv()
+makeargv(void)
 {
 	char **argp = margv;
 	char *cp;
@@ -226,9 +225,7 @@ makeargv()
  * Help command.
  */
 void
-help(argc, argv)
-	int argc;
-	char *argv[];
+help(int argc, char *argv[])
 {
 	extern struct cmd cmdtab[];
 	struct cmd *c;
diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c
index 7cb7876a2ab..b9f1f643ba2 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.c
+++ b/usr.sbin/ypserv/ypserv/ypserv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv.c,v 1.28 2003/06/02 21:58:27 maja Exp $ */
+/*	$OpenBSD: ypserv.c,v 1.29 2003/06/12 21:09:48 deraadt Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -27,7 +27,7 @@
  */
 
 #ifndef LINT
-static const char rcsid[] = "$OpenBSD: ypserv.c,v 1.28 2003/06/02 21:58:27 maja Exp $";
+static const char rcsid[] = "$OpenBSD: ypserv.c,v 1.29 2003/06/12 21:09:48 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
@@ -329,7 +329,7 @@ ypprog_2(struct svc_req *rqstp, SVCXPRT *transp)
 }
 
 void
-hup()
+hup(void)
 {
 	/* Handle the log. */
 	ypcloselog();
@@ -346,7 +346,7 @@ hup()
 }
 
 void
-my_svc_run()
+my_svc_run(void)
 {
 	fd_set *fds;