Cleanup of userland __P use

7 files changed, 37 insertions, 37 deletions

diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c
index bdc8ec3..62056ae 100644
--- a/usr.sbin/rtsold/dump.c
+++ b/usr.sbin/rtsold/dump.c
@@ -51,8 +51,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 eb28805..4b238a1 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -63,8 +63,8 @@
 extern int rssock;
 static int ifsock;
 
-static int get_llflag __P((const char *));
-static void get_rtaddrs __P((int, struct sockaddr *, struct sockaddr **));
+static int get_llflag(const char *);
+static void get_rtaddrs(int, struct sockaddr *, struct sockaddr **);
 
 int
 ifinit(void)
diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c
index b1cbc79..61c47bc 100644
--- a/usr.sbin/rtsold/probe.c
+++ b/usr.sbin/rtsold/probe.c
@@ -60,7 +60,7 @@
 static struct msghdr sndmhdr;
 static struct iovec sndiov[2];
 static int probesock;
-static void sendprobe __P((struct in6_addr *, struct ifinfo *));
+static void sendprobe(struct in6_addr *, struct ifinfo *);
 
 int
 probe_init(void)
diff --git a/usr.sbin/rtsold/rtsock.c b/usr.sbin/rtsold/rtsock.c
index 09d6774..0de6e85 100644
--- a/usr.sbin/rtsold/rtsock.c
+++ b/usr.sbin/rtsold/rtsock.c
@@ -64,13 +64,13 @@
 		       : sizeof(u_long)))
 
 #ifdef RTM_IFANNOUNCE	/*NetBSD 1.5 or later*/
-static int rtsock_input_ifannounce __P((int, struct rt_msghdr *, char *));
+static int rtsock_input_ifannounce(int, struct rt_msghdr *, char *);
 #endif
 
 static struct {
 	u_char type;
 	size_t minlen;
-	int (*func) __P((int, struct rt_msghdr *, char *));
+	int (*func)(int, struct rt_msghdr *, char *);
 } rtsock_dispatch[] = {
 #ifdef RTM_IFANNOUNCE	/*NetBSD 1.5 or later*/
 	{ RTM_IFANNOUNCE, sizeof(struct if_announcemsghdr),
diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c
index dd9f4a1..3420f2f 100644
--- a/usr.sbin/rtsold/rtsol.c
+++ b/usr.sbin/rtsold/rtsol.c
@@ -75,8 +75,8 @@ int rssock;
 static struct sockaddr_in6 sin6_allrouters =
 {sizeof(sin6_allrouters), AF_INET6};
 
-static void call_script __P((char *, char *));
-static int safefile __P((const char *));
+static void call_script(char *, char *);
+static int safefile(const char *);
 
 int
 sockopen(void)
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index 7e73f38..82d5eaf 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -80,7 +80,7 @@ char *otherconf_script;
  */
 #define PROBE_INTERVAL 60
 
-int main __P((int, char **));
+int main(int, char **);
 
 /* static variables and functions */
 static int mobile_node = 0;
@@ -93,15 +93,15 @@ static char *pidfilename = "/var/run/rtsold.pid"; /* should be configurable */
 #endif
 
 #if 0
-static int ifreconfig __P((char *));
+static int ifreconfig(char *);
 #endif
-static int make_packet __P((struct ifinfo *));
-static struct timeval *rtsol_check_timer __P((void));
+static int make_packet(struct ifinfo *);
+static struct timeval *rtsol_check_timer(void);
 
 #ifndef SMALL
-static void rtsold_set_dump_file __P((int));
+static void rtsold_set_dump_file(int);
 #endif
-static void usage __P((char *));
+static void usage(char *);
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index e25ed95..88e6311 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -68,36 +68,36 @@ extern struct timeval tm_max;
 extern int dflag;
 extern int aflag;
 extern char *otherconf_script;
-extern int ifconfig __P((char *));
-extern void iflist_init __P((void));
-struct ifinfo *find_ifinfo __P((int));
-void rtsol_timer_update __P((struct ifinfo *));
-extern void warnmsg __P((int, const char *, const char *, ...))
+extern int ifconfig(char *);
+extern void iflist_init(void);
+struct ifinfo *find_ifinfo(int);
+void rtsol_timer_update(struct ifinfo *);
+extern void warnmsg(int, const char *, const char *, ...)
      __attribute__((__format__(__printf__, 3, 4)));
-extern char **autoifprobe __P((void));
+extern char **autoifprobe(void);
 
 /* if.c */
-extern int ifinit __P((void));
-extern int interface_up __P((char *));
-extern int interface_status __P((struct ifinfo *));
-extern int lladdropt_length __P((struct sockaddr_dl *));
-extern void lladdropt_fill __P((struct sockaddr_dl *, struct nd_opt_hdr *));
-extern struct sockaddr_dl *if_nametosdl __P((char *));
-extern int getinet6sysctl __P((int));
-extern int setinet6sysctl __P((int, int));
+extern int ifinit(void);
+extern int interface_up(char *);
+extern int interface_status(struct ifinfo *);
+extern int lladdropt_length(struct sockaddr_dl *);
+extern void lladdropt_fill(struct sockaddr_dl *, struct nd_opt_hdr *);
+extern struct sockaddr_dl *if_nametosdl(char *);
+extern int getinet6sysctl(int);
+extern int setinet6sysctl(int, int);
 
 /* rtsol.c */
-extern int sockopen __P((void));
-extern void sendpacket __P((struct ifinfo *));
-extern void rtsol_input __P((int));
+extern int sockopen(void);
+extern void sendpacket(struct ifinfo *);
+extern void rtsol_input(int);
 
 /* probe.c */
-extern int probe_init __P((void));
-extern void defrouter_probe __P((struct ifinfo *));
+extern int probe_init(void);
+extern void defrouter_probe(struct ifinfo *);
 
 /* dump.c */
-extern void rtsold_dump_file __P((char *));
+extern void rtsold_dump_file(char *);
 
 /* rtsock.c */
-extern int rtsock_open __P((void));
-extern int rtsock_input __P((int));
+extern int rtsock_open(void);
+extern int rtsock_input(int);