Cleanup of userland __P use

7 files changed, 70 insertions, 66 deletions

diff --git a/usr.sbin/timed/timed/correct.c b/usr.sbin/timed/timed/correct.c
index c7204bd..d948dee 100644
--- a/usr.sbin/timed/timed/correct.c
+++ b/usr.sbin/timed/timed/correct.c
@@ -44,7 +44,7 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/times.h>
 
-static void adjclock __P((struct timeval *));
+static void adjclock(struct timeval *);
 
 /*
  * sends to the slaves the corrections for their clocks after fixing our
diff --git a/usr.sbin/timed/timed/extern.h b/usr.sbin/timed/timed/extern.h
index 09dfaaa..870ef9e 100644
--- a/usr.sbin/timed/timed/extern.h
+++ b/usr.sbin/timed/timed/extern.h
@@ -1,3 +1,5 @@
+/*	$FreeBSD$	*/
+
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,51 +41,51 @@ struct sockaddr_in;
 struct timeval;
 struct tsp;
 
-struct hosttbl *addmach __P((char *, struct sockaddr_in *, struct netinfo *));
-struct hosttbl *findhost __P((char *));
-struct hosttbl *remmach __P((struct hosttbl *));
+struct hosttbl *addmach(char *, struct sockaddr_in *, struct netinfo *);
+struct hosttbl *findhost(char *);
+struct hosttbl *remmach(struct hosttbl *);
 
-struct tsp *readmsg __P((int,
-	    char *, struct timeval *, struct netinfo *));
-struct tsp *acksend __P((struct tsp *,
-	    struct sockaddr_in *, char *, int, struct netinfo *, int));
+struct tsp *readmsg(int,
+	    char *, struct timeval *, struct netinfo *);
+struct tsp *acksend(struct tsp *,
+	    struct sockaddr_in *, char *, int, struct netinfo *, int);
 
-void	 addnetname __P((char *));
-void	 adj_msg_time __P((struct tsp *, struct timeval *));
-void	 bytehostorder __P((struct tsp *));
-void	 bytenetorder __P((struct tsp *));
-void	 byteorder __P((struct tsp *));
-long	 casual __P((long, long));
-int	 cksum __P((u_short *, int));
-void	 correct __P((long));
-char	*date __P((void));
-void	 doquit __P((struct tsp *));
-int	 election __P((struct netinfo *));
-void	 get_goodgroup __P((int));
-int	 good_host_name __P((char *));
-void	 ignoreack __P((void));
-int	 in_cksum __P((u_short *, int));
-void	 lookformaster __P((struct netinfo *));
-void	 makeslave __P((struct netinfo *));
-int	 master __P((void));
-void	 masterack __P((void));
-void	 masterup __P((struct netinfo *));
-int	 measure __P((u_long, u_long, char *, struct sockaddr_in *, int));
-void	 msterup __P((struct netinfo *));
-void	 mstotvround __P((struct timeval *, long));
-long	 networkdelta __P((void));
-void	 newslave __P((struct tsp *));
-void	 print __P((struct tsp *, struct sockaddr_in *));
-void	 prthp __P((clock_t));
-void	 rmnetmachs __P((struct netinfo *));
-void	 setstatus __P((void));
-int	 slave __P((void));
-void	 slaveack __P((void));
-void	 spreadtime __P((void));
-void	 suppress __P((struct sockaddr_in *, char *, struct netinfo *));
-void	 synch __P((long));
-void	 timevaladd __P((struct timeval *, struct timeval *));
-void	 timevalsub __P((struct timeval *, struct timeval *, struct timeval *));
-void	 traceoff __P((char *));
-void	 traceon __P((void));
-void	 xmit __P((int, u_int, struct sockaddr_in *));
+void	 addnetname(char *);
+void	 adj_msg_time(struct tsp *, struct timeval *);
+void	 bytehostorder(struct tsp *);
+void	 bytenetorder(struct tsp *);
+void	 byteorder(struct tsp *);
+long	 casual(long, long);
+int	 cksum(u_short *, int);
+void	 correct(long);
+char	*date(void);
+void	 doquit(struct tsp *);
+int	 election(struct netinfo *);
+void	 get_goodgroup(int);
+int	 good_host_name(char *);
+void	 ignoreack(void);
+int	 in_cksum(u_short *, int);
+void	 lookformaster(struct netinfo *);
+void	 makeslave(struct netinfo *);
+int	 master(void);
+void	 masterack(void);
+void	 masterup(struct netinfo *);
+int	 measure(u_long, u_long, char *, struct sockaddr_in *, int);
+void	 msterup(struct netinfo *);
+void	 mstotvround(struct timeval *, long);
+long	 networkdelta(void);
+void	 newslave(struct tsp *);
+void	 print(struct tsp *, struct sockaddr_in *);
+void	 prthp(clock_t);
+void	 rmnetmachs(struct netinfo *);
+void	 setstatus(void);
+int	 slave(void);
+void	 slaveack(void);
+void	 spreadtime(void);
+void	 suppress(struct sockaddr_in *, char *, struct netinfo *);
+void	 synch(long);
+void	 timevaladd(struct timeval *, struct timeval *);
+void	 timevalsub(struct timeval *, struct timeval *, struct timeval *);
+void	 traceoff(char *);
+void	 traceon(void);
+void	 xmit(int, u_int, struct sockaddr_in *);
diff --git a/usr.sbin/timed/timed/master.c b/usr.sbin/timed/timed/master.c
index 0713155..e36fbae 100644
--- a/usr.sbin/timed/timed/master.c
+++ b/usr.sbin/timed/timed/master.c
@@ -54,9 +54,9 @@ extern int justquit;
 static int dictate;
 static int slvcount;			/* slaves listening to our clock */
 
-static void mchgdate __P((struct tsp *));
+static void mchgdate(struct tsp *);
 
-extern void logwtmp __P((char *, char *, char *));
+extern void logwtmp(char *, char *, char *);
 
 /*
  * The main function of `master' is to periodically compute the differences
diff --git a/usr.sbin/timed/timed/networkdelta.c b/usr.sbin/timed/timed/networkdelta.c
index cbbde58..5f1af7e 100644
--- a/usr.sbin/timed/timed/networkdelta.c
+++ b/usr.sbin/timed/timed/networkdelta.c
@@ -41,7 +41,7 @@ static const char rcsid[] =
 
 #include "globals.h"
 
-static long median __P((float, float *, long *, long *, unsigned int));
+static long median(float, float *, long *, long *, unsigned int);
 
 /*
  * Compute a corrected date.
diff --git a/usr.sbin/timed/timed/slave.c b/usr.sbin/timed/timed/slave.c
index db4d2dd..217fd82 100644
--- a/usr.sbin/timed/timed/slave.c
+++ b/usr.sbin/timed/timed/slave.c
@@ -53,11 +53,11 @@ static char master_name[MAXHOSTNAMELEN];
 static struct netinfo *old_slavenet;
 static int old_status;
 
-static void schgdate __P((struct tsp *, char *));
-static void setmaster __P((struct tsp *));
-static void answerdelay __P((void));
+static void schgdate(struct tsp *, char *);
+static void setmaster(struct tsp *);
+static void answerdelay(void);
 
-extern void logwtmp __P((char *, char *, char *));
+extern void logwtmp(char *, char *, char *);
 
 int
 slave()
diff --git a/usr.sbin/timed/timedc/extern.h b/usr.sbin/timed/timedc/extern.h
index 7f33362..e1dbfe5 100644
--- a/usr.sbin/timed/timedc/extern.h
+++ b/usr.sbin/timed/timedc/extern.h
@@ -1,3 +1,5 @@
+/*	$FreeBSD$	*/
+
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,14 +41,14 @@ struct tsp;
 
 extern struct cmd cmdtab[];
 
-void	bytehostorder __P((struct tsp *));
-void	bytenetorder __P((struct tsp *));
-void	clockdiff __P((int, char *[]));
-void	help __P((int, char *[]));
-void	intr __P((int));
-void	makeargv __P((void));
-void	msite __P((int, char *[]));
-int	priv_resources __P((void));
-void	quit __P((void));
-void	testing __P((int, char *[]));
-void	tracing __P((int, char *[]));
+void	bytehostorder(struct tsp *);
+void	bytenetorder(struct tsp *);
+void	clockdiff(int, char *[]);
+void	help(int, char *[]);
+void	intr(int);
+void	makeargv(void);
+void	msite(int, char *[]);
+int	priv_resources(void);
+void	quit(void);
+void	testing(int, char *[]);
+void	tracing(int, char *[]);
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 368b460..0911946 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -63,7 +63,7 @@ int	fromatty;
 char	*margv[MAX_MARGV];
 char	cmdline[200];
 jmp_buf	toplevel;
-static struct cmd *getcmd __P((char *));
+static struct cmd *getcmd(char *);
 
 int
 main(argc, argv)