Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

5 files changed, 35 insertions, 35 deletions

diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index 3769d11e1f0..57d614e8219 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.c,v 1.6 2001/08/22 05:34:54 itojun Exp $	*/
+/*	$OpenBSD: dump.c,v 1.7 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: dump.c,v 1.9 2001/08/20 06:55:54 itojun Exp $	*/
 
 /*
@@ -50,8 +50,8 @@ static FILE *fp;
 
 extern struct ifinfo *iflist;
 
-static void dump_interface_status __P((void));
-static char *sec2str __P((time_t));
+static void dump_interface_status(void);
+static char *sec2str(time_t);
 char *ifstatstr[] = {"IDLE", "DELAY", "PROBE", "DOWN", "TENTATIVE"};
 
 static void
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index 106c2247b57..9b52e09c1ed 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.8 2001/11/14 01:59:36 itojun Exp $	*/
+/*	$OpenBSD: if.c,v 1.9 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: if.c,v 1.15 2001/05/22 06:04:17 jinmei Exp $	*/
 
 /*
@@ -76,9 +76,9 @@
 extern int rssock;
 static int ifsock;
 
-static int get_llflag __P((const char *name));
+static int get_llflag(const char *name);
 #ifndef HAVE_GETIFADDRS
-static unsigned int if_maxindex __P((void));
+static unsigned int if_maxindex(void);
 #endif
 static void get_rtaddrs __P((int addrs, struct sockaddr *sa,
 			     struct sockaddr **rti_info));
diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index 349b40b896b..ea1e175d8cc 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: probe.c,v 1.3 2000/08/13 18:24:00 itojun Exp $	*/
+/*	$OpenBSD: probe.c,v 1.4 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: probe.c,v 1.10 2000/08/13 06:14:59 itojun Exp $	*/
 
 /*
@@ -60,7 +60,7 @@
 static struct msghdr sndmhdr;
 static struct iovec sndiov[2];
 static int probesock;
-static void sendprobe __P((struct in6_addr *addr, int ifindex));
+static void sendprobe(struct in6_addr *addr, int ifindex);
 
 
 int
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index e17fc79cea2..bfa8a7bd2f9 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsold.c,v 1.14 2002/01/11 03:51:08 itojun Exp $	*/
+/*	$OpenBSD: rtsold.c,v 1.15 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: rtsold.c,v 1.32 2001/07/09 22:34:07 itojun Exp $	*/
 
 /*
@@ -83,27 +83,27 @@ static int fflag = 0;
 /* a == b */
 #define TIMEVAL_EQ(a, b) (((a).tv_sec==(b).tv_sec) && ((a).tv_usec==(b).tv_usec))
 
-int main __P((int argc, char *argv[]));
+int main(int argc, char *argv[]);
 
 /* static variables and functions */
 static int mobile_node = 0;
 volatile sig_atomic_t do_dump;
 static char *dumpfilename = "/var/run/rtsold.dump"; /* XXX: should be configurable */
 
-static int ifconfig __P((char *ifname));
+static int ifconfig(char *ifname);
 #if 0
-static int ifreconfig __P((char *ifname));
+static int ifreconfig(char *ifname);
 #endif
-static int make_packet __P((struct ifinfo *ifinfo));
-static struct timeval *rtsol_check_timer __P((void));
+static int make_packet(struct ifinfo *ifinfo);
+static struct timeval *rtsol_check_timer(void);
 static void TIMEVAL_ADD __P((struct timeval *a, struct timeval *b,
 			     struct timeval *result));
 static void TIMEVAL_SUB __P((struct timeval *a, struct timeval *b,
 			     struct timeval *result));
 
-static void rtsold_set_dump_file __P((void));
-static void usage __P((char *progname));
-static char **autoifprobe __P((void));
+static void rtsold_set_dump_file(void);
+static void usage(char *progname);
+static char **autoifprobe(void);
 
 int
 main(argc, argv)
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index 9459bc992cb..6c4a719c564 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsold.h,v 1.6 2001/07/09 22:37:33 itojun Exp $	*/
+/*	$OpenBSD: rtsold.h,v 1.7 2002/02/16 21:28:09 millert Exp $	*/
 /*	$KAME: rtsold.h,v 1.11 2000/10/10 06:18:04 itojun Exp $	*/
 
 /*
@@ -62,35 +62,35 @@ struct ifinfo {
 /* rtsold.c */
 extern struct timeval tm_max;
 extern int dflag;
-struct ifinfo *find_ifinfo __P((int ifindex));
-void rtsol_timer_update __P((struct ifinfo *ifinfo));
-extern void warnmsg __P((int, const char *, const char *, ...))
+struct ifinfo *find_ifinfo(int ifindex);
+void rtsol_timer_update(struct ifinfo *ifinfo);
+extern void warnmsg(int, const char *, const char *, ...)
      __attribute__((__format__(__printf__, 3, 4)));
 
 /* if.c */
-extern int ifinit __P((void));
-extern int interface_up __P((char *name));
-extern int interface_status __P((struct ifinfo*));
-extern int lladdropt_length __P((struct sockaddr_dl *sdl));
+extern int ifinit(void);
+extern int interface_up(char *name);
+extern int interface_status(struct ifinfo*);
+extern int lladdropt_length(struct sockaddr_dl *sdl);
 extern void lladdropt_fill __P((struct sockaddr_dl *sdl,
 				struct nd_opt_hdr *ndopt));
-extern struct sockaddr_dl *if_nametosdl __P((char *name));
-extern int getinet6sysctl __P((int code));
+extern struct sockaddr_dl *if_nametosdl(char *name);
+extern int getinet6sysctl(int code);
 
 /* rtsol.c */
-extern int sockopen __P((void));
-extern void sendpacket __P((struct ifinfo *ifinfo));
-extern void rtsol_input __P((int s));
+extern int sockopen(void);
+extern void sendpacket(struct ifinfo *ifinfo);
+extern void rtsol_input(int s);
 
 /* probe.c */
-extern int probe_init __P((void));
-extern void defrouter_probe __P((int ifindex));
+extern int probe_init(void);
+extern void defrouter_probe(int ifindex);
 
 /* dump.c */
-extern void rtsold_dump_file __P((char *));
+extern void rtsold_dump_file(char *);
 
 #if 0
 /* rtsock.c */
-extern int rtsock_open __P((void));
-extern int rtsock_input __P((int));
+extern int rtsock_open(void);
+extern int rtsock_input(int);
 #endif