From 305c3bd05283008cefd17fb91079231d863eecf0 Mon Sep 17 00:00:00 2001
From: Chris Pressey <cpressey@dragonflybsd.org>
Date: Tue, 30 Mar 2004 01:14:22 +0000
Subject: [PATCH] Style(9) cleanup.

- Convert K&R-style function definitions to ANSI style.
- Remove ``register'' keywords.
- char *argv[] -> char **argv
- No functional changes.
---
 usr.sbin/ndp/ndp.c                 | 80 +++++++++++-------------------
 usr.sbin/traceroute6/traceroute6.c | 55 +++++++-------------
 usr.sbin/ypbind/yp_ping.c          | 41 +++++++--------
 usr.sbin/ypbind/ypbind.c           | 63 +++++++----------------
 4 files changed, 83 insertions(+), 156 deletions(-)

diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 2ecaa186a6..95edbd7ee2 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.2.2.5 2001/08/13 02:58:26 sumikawa Exp $	*/
-/*	$DragonFly: src/usr.sbin/ndp/ndp.c,v 1.3 2003/11/03 19:31:39 eirikn Exp $	*/
+/*	$DragonFly: src/usr.sbin/ndp/ndp.c,v 1.4 2004/03/30 01:14:22 cpressey Exp $	*/
 /*	$KAME: ndp.c,v 1.65 2001/05/08 04:36:34 itojun Exp $	*/
 
 /*
@@ -171,9 +171,7 @@ static char *rtpref_str[] = {
 };
 
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char **argv)
 {
 	int ch;
 	int aflag = 0, dflag = 0, sflag = 0, Hflag = 0,
@@ -300,8 +298,7 @@ main(argc, argv)
  * Process a file to set standard ndp entries
  */
 int
-file(name)
-	char *name;
+file(char *name)
 {
 	FILE *fp;
 	int i, retval;
@@ -333,7 +330,7 @@ file(name)
 }
 
 void
-getsocket()
+getsocket(void)
 {
 	if (s < 0) {
 		s = socket(PF_ROUTE, SOCK_RAW, 0);
@@ -357,13 +354,11 @@ struct	{
  * Set an individual neighbor cache entry
  */
 int
-set(argc, argv)
-	int argc;
-	char **argv;
+set(int argc, char **argv)
 {
-	register struct sockaddr_in6 *sin = &sin_m;
-	register struct sockaddr_dl *sdl;
-	register struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
+	struct sockaddr_in6 *sin = &sin_m;
+	struct sockaddr_dl *sdl;
+	struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
 	struct addrinfo hints, *res;
 	int gai_error;
 	u_char *ea;
@@ -438,8 +433,7 @@ overwrite:
  * Display an individual neighbor cache entry
  */
 void
-get(host)
-	char *host;
+get(char *host)
 {
 	struct sockaddr_in6 *sin = &sin_m;
 	struct addrinfo hints, *res;
@@ -475,11 +469,10 @@ get(host)
  * Delete a neighbor cache entry
  */
 int
-delete(host)
-	char *host;
+delete(char *host)
 {
 	struct sockaddr_in6 *sin = &sin_m;
-	register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
+	struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
 	struct sockaddr_dl *sdl;
 	struct addrinfo hints, *res;
 	int gai_error;
@@ -553,8 +546,7 @@ delete:
  * Dump the entire neighbor cache
  */
 void
-dump(addr)
-	struct in6_addr *addr;
+dump(struct in6_addr *addr)
 {
 	int mib[6];
 	size_t needed;
@@ -750,10 +742,7 @@ again:;
 }
 
 static struct in6_nbrinfo *
-getnbrinfo(addr, ifindex, warning)
-	struct in6_addr *addr;
-	int ifindex;
-	int warning;
+getnbrinfo(struct in6_addr *addr, int ifindex, int warning)
 {
 	static struct in6_nbrinfo nbi;
 	int s;
@@ -776,8 +765,7 @@ getnbrinfo(addr, ifindex, warning)
 }
 
 static char *
-ether_str(sdl)
-	struct sockaddr_dl *sdl;
+ether_str(struct sockaddr_dl *sdl)
 {
 	static char ebuf[32];
 	u_char *cp;
@@ -794,9 +782,7 @@ ether_str(sdl)
 }
 
 int
-ndp_ether_aton(a, n)
-	char *a;
-	u_char *n;
+ndp_ether_aton(char *a, u_char *n)
 {
 	int i, o[6];
 
@@ -812,7 +798,7 @@ ndp_ether_aton(a, n)
 }
 
 void
-usage()
+usage(void)
 {
 	printf("usage: ndp hostname\n");
 	printf("       ndp -a[nt]\n");
@@ -834,14 +820,13 @@ usage()
 }
 
 int
-rtmsg(cmd)
-	int cmd;
+rtmsg(int cmd)
 {
 	static int seq;
 	int rlen;
-	register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
-	register char *cp = m_rtmsg.m_space;
-	register int l;
+	struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
+	char *cp = m_rtmsg.m_space;
+	int l;
 
 	errno = 0;
 	if (cmd == RTM_DELETE)
@@ -897,9 +882,7 @@ doit:
 }
 
 void
-ifinfo(argc, argv)
-	int argc;
-	char **argv;
+ifinfo(int argc, char **argv)
 {
 	struct in6_ndireq nd;
 	int i, s;
@@ -997,7 +980,7 @@ ifinfo(argc, argv)
 #endif
 
 void
-rtrlist()
+rtrlist(void)
 {
 #ifdef ICMPV6CTL_ND6_DRLIST
 	int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_DRLIST };
@@ -1090,7 +1073,7 @@ rtrlist()
 }
 
 void
-plist()
+plist(void)
 {
 #ifdef ICMPV6CTL_ND6_PRLIST
 	int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_PRLIST };
@@ -1384,7 +1367,7 @@ plist()
 }
 
 void
-pfx_flush()
+pfx_flush(void)
 {
 	char dummyif[IFNAMSIZ+8];
 	int s;
@@ -1397,7 +1380,7 @@ pfx_flush()
 }
 
 void
-rtr_flush()
+rtr_flush(void)
 {
 	char dummyif[IFNAMSIZ+8];
 	int s;
@@ -1412,7 +1395,7 @@ rtr_flush()
 }
 
 void
-harmonize_rtr()
+harmonize_rtr(void)
 {
 	char dummyif[IFNAMSIZ+8];
 	int s;
@@ -1428,8 +1411,7 @@ harmonize_rtr()
 
 #ifdef SIOCSDEFIFACE_IN6	/* XXX: check SIOCGDEFIFACE_IN6 as well? */
 static void
-setdefif(ifname)
-	char *ifname;
+setdefif(char *ifname)
 {
 	struct in6_ndifreq ndifreq;
 	unsigned int ifindex;
@@ -1454,7 +1436,7 @@ setdefif(ifname)
 }
 
 static void
-getdefif()
+getdefif(void)
 {
 	struct in6_ndifreq ndifreq;
 	char ifname[IFNAMSIZ+8];
@@ -1482,8 +1464,7 @@ getdefif()
 #endif
 
 static char *
-sec2str(total)
-	time_t total;
+sec2str(time_t total)
 {
 	static char result[256];
 	int days, hours, mins, secs;
@@ -1517,8 +1498,7 @@ sec2str(total)
  * from tcpdump/util.c
  */
 static void
-ts_print(tvp)
-	const struct timeval *tvp;
+ts_print(const struct timeval *tvp)
 {
 	int s;
 
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index b614fcb4f8..7b95ef9a46 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -31,7 +31,7 @@
  * @(#) Copyright (c) 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)traceroute.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/traceroute6/traceroute6.c,v 1.4.2.4 2001/07/03 11:02:18 ume Exp $
- * $DragonFly: src/usr.sbin/traceroute6/traceroute6.c,v 1.3 2003/11/03 19:31:44 eirikn Exp $
+ * $DragonFly: src/usr.sbin/traceroute6/traceroute6.c,v 1.4 2004/03/30 01:14:22 cpressey Exp $
  */
 
 /*-
@@ -309,7 +309,7 @@ struct opacket {
 u_char	packet[512];		/* last inbound (icmp) packet */
 struct opacket	*outpacket;	/* last output (udp) packet */
 
-int	main(int, char *[]);
+int	main(int, char **);
 int	wait_for_reply(int, struct msghdr *);
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
@@ -366,9 +366,7 @@ const int niflag = 0;
 #endif
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char **argv)
 {
 	struct hostent *hp;
 	int error;
@@ -901,9 +899,7 @@ main(argc, argv)
 }
 
 int
-wait_for_reply(sock, mhdr)
-	int sock;
-	struct msghdr *mhdr;
+wait_for_reply(int sock, struct msghdr *mhdr)
 {
 #ifdef HAVE_POLL
 	struct pollfd pfd[1];
@@ -940,9 +936,7 @@ wait_for_reply(sock, mhdr)
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
 int
-setpolicy(so, policy)
-	int so;
-	char *policy;
+setpolicy(int so, char *policy)
 {
 	char *buf;
 
@@ -962,8 +956,7 @@ setpolicy(so, policy)
 #endif
 
 void
-send_probe(seq, hops)
-	int seq, hops;
+send_probe(int seq, int hops)
 {
 	struct opacket *op = outpacket;
 	int i;
@@ -991,8 +984,7 @@ send_probe(seq, hops)
 }
 
 int
-get_hoplim(mhdr)
-	struct msghdr *mhdr;
+get_hoplim(struct msghdr *mhdr)
 {
 	struct cmsghdr *cm;
 
@@ -1008,10 +1000,9 @@ get_hoplim(mhdr)
 }
 
 double
-deltaT(t1p, t2p)
-	struct timeval *t1p, *t2p;
+deltaT(struct timeval *t1p, struct timeval *t2p)
 {
-	register double dt;
+	double dt;
 
 	dt = (double)(t2p->tv_sec - t1p->tv_sec) * 1000.0 +
 	     (double)(t2p->tv_usec - t1p->tv_usec) / 1000.0;
@@ -1023,8 +1014,7 @@ deltaT(t1p, t2p)
  * Convert an ICMP "type" field to a printable string.
  */
 char *
-pr_type(t0)
-	int t0;
+pr_type(int t0)
 {
 	u_char t = t0 & 0xff;
 	char *cp;
@@ -1081,12 +1071,9 @@ pr_type(t0)
 
 
 int
-packet_ok(mhdr, cc, seq)
-	struct msghdr *mhdr;
-	int cc;
-	int seq;
+packet_ok(struct msghdr *mhdr, int cc, int seq)
 {
-	register struct icmp6_hdr *icp;
+	struct icmp6_hdr *icp;
 	struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name;
 	u_char type, code;
 	char *buf = (char *)mhdr->msg_iov[0].iov_base;
@@ -1207,9 +1194,7 @@ packet_ok(mhdr, cc, seq)
  * Increment pointer until find the UDP header.
  */
 struct udphdr *
-get_udphdr(ip6, lim)
-	struct ip6_hdr *ip6;
-	u_char *lim;
+get_udphdr(struct ip6_hdr *ip6, u_char *lim)
 {
 	u_char *cp = (u_char *)ip6, nh;
 	int hlen;
@@ -1249,9 +1234,7 @@ get_udphdr(ip6, lim)
 }
 
 void
-print(mhdr, cc)
-	struct msghdr *mhdr;
-	int cc;
+print(struct msghdr *mhdr, int cc)
 {
 	struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name;
 	char hbuf[NI_MAXHOST];
@@ -1286,8 +1269,7 @@ print(mhdr, cc)
  * Out is assumed to be >= in.
  */
 void
-tvsub(out, in)
-	register struct timeval *out, *in;
+tvsub(struct timeval *out, struct timeval *in)
 {
 	if ((out->tv_usec -= in->tv_usec) < 0)   {
 		out->tv_sec--;
@@ -1303,10 +1285,9 @@ tvsub(out, in)
  * numeric value, otherwise try for symbolic name.
  */
 const char *
-inetname(sa)
-	struct sockaddr *sa;
+inetname(struct sockaddr *sa)
 {
-	register char *cp;
+	char *cp;
 	static char line[NI_MAXHOST];
 	static char domain[MAXHOSTNAMELEN + 1];
 	static int first = 1;
@@ -1339,7 +1320,7 @@ inetname(sa)
 }
 
 void
-usage()
+usage(void)
 {
 	(void)fprintf(stderr,
 "usage: traceroute6 [-dlnrv] [-f firsthop] [-g gateway] [-m hoplimit] [-p port]\n"
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index d53e0e522b..b84298c55b 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -32,7 +32,7 @@
  * @(#)from: clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro
  * @(#)from: clnt_udp.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/usr.sbin/ypbind/yp_ping.c,v 1.6.2.1 2002/02/15 00:46:59 des Exp $
- * $DragonFly: src/usr.sbin/ypbind/yp_ping.c,v 1.3 2003/11/22 19:30:57 asmodai Exp $
+ * $DragonFly: src/usr.sbin/ypbind/yp_ping.c,v 1.4 2004/03/30 01:14:22 cpressey Exp $
  */
 
 /*
@@ -136,19 +136,18 @@ struct cu_data {
 };
 
 static enum clnt_stat
-clntudp_a_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
-	register CLIENT	*cl;		/* client handle */
-	u_long		proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	caddr_t		argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	caddr_t		resultsp;	/* pointer to results */
-	struct timeval	utimeout;	/* seconds to wait before giving up */
+clntudp_a_call(CLIENT *cl,		/* client handle */
+	       u_long proc,		/* procedure number */
+	       xdrproc_t xargs,		/* xdr routine for args */
+	       caddr_t argsp,		/* pointer to args */
+	       xdrproc_t xresults,	/* xdr routine for results */
+	       caddr_t resultsp,	/* pointer to results */
+	       struct timeval utimeout)	/* seconds to wait before giving up */
 {
-	register struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	register XDR *xdrs;
-	register int outlen = 0;
-	register int inlen;
+	struct cu_data *cu = (struct cu_data *)cl->cl_private;
+	XDR *xdrs;
+	int outlen = 0;
+	int inlen;
 	int fromlen;
 	fd_set *fds, readfds;
 	struct sockaddr_in from;
@@ -338,15 +337,12 @@ static struct timeval tottimeout = { 1, 0 };
  * Returns 0 if no map exists.
  */
 static u_short
-__pmap_getport(address, program, version, protocol)
-	struct sockaddr_in *address;
-	u_long program;
-	u_long version;
-	u_int protocol;
+__pmap_getport(struct sockaddr_in *address,
+	       u_long program, u_long version, u_long protocol)
 {
 	u_short port = 0;
 	int sock = -1;
-	register CLIENT *client;
+	CLIENT *client;
 	struct pmap parms;
 
 	address->sin_port = htons(PMAPPORT);
@@ -438,11 +434,8 @@ struct ping_req {
 	unsigned long		xid;
 };
 
-int __yp_ping(restricted_addrs, cnt, dom, port)
-	struct in_addr		*restricted_addrs;
-	int			cnt;
-	char			*dom;
-	short			*port;
+int __yp_ping(struct in_addr *restricted_addrs, int cnt,
+	      char *dom, short int *port)
 {
 	struct timeval		tv = { 5, 0 };
 	struct ping_req		**reqs;
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 31bd2d8847..5ab5cd278e 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ypbind/ypbind.c,v 1.30.2.2 2002/02/15 00:46:59 des Exp $
- * $DragonFly: src/usr.sbin/ypbind/ypbind.c,v 1.3 2004/01/08 18:39:19 asmodai Exp $
+ * $DragonFly: src/usr.sbin/ypbind/ypbind.c,v 1.4 2004/03/30 01:14:22 cpressey Exp $
  */
 
 #include <sys/param.h>
@@ -154,10 +154,7 @@ fd_set fdsr;
 SVCXPRT *udptransp, *tcptransp;
 
 void *
-ypbindproc_null_2_yp(transp, argp, clnt)
-SVCXPRT *transp;
-void *argp;
-CLIENT *clnt;
+ypbindproc_null_2_yp(SVCXPRT *transp, void *argp, CLIENT *clnt)
 {
 	static char res;
 
@@ -166,10 +163,7 @@ CLIENT *clnt;
 }
 
 struct ypbind_resp *
-ypbindproc_domain_2_yp(transp, argp, clnt)
-SVCXPRT *transp;
-domainname *argp;
-CLIENT *clnt;
+ypbindproc_domain_2_yp(SVCXPRT *transp, domainname *argp, CLIENT *clnt)
 {
 	static struct ypbind_resp res;
 	struct _dom_binding *ypdb;
@@ -239,13 +233,10 @@ rejecting.", *argp);
 }
 
 void *
-ypbindproc_setdom_2_yp(transp, argp, clnt)
-SVCXPRT *transp;
-ypbind_setdom *argp;
-CLIENT *clnt;
+ypbindproc_setdom_2_yp(SVCXPRT *transp, ypbind_setdom *argp, CLIENT *clnt)
 {
 	struct sockaddr_in *fromsin, bindsin;
-	static char		*result = NULL;
+	static char *result = NULL;
 
 	if (strchr(argp->ypsetdom_domain, '/')) {
 		syslog(LOG_WARNING, "Domain name '%s' has embedded slash -- \
@@ -289,9 +280,7 @@ rejecting.", argp->ypsetdom_domain);
 }
 
 static void
-ypbindprog_2(rqstp, transp)
-struct svc_req *rqstp;
-register SVCXPRT *transp;
+ypbindprog_2(struct svc_req *rqstp, SVCXPRT *transp)
 {
 	union {
 		domainname ypbindproc_domain_2_arg;
@@ -351,8 +340,7 @@ register SVCXPRT *transp;
 }
 
 /* Jack the reaper */
-void reaper(sig)
-int sig;
+void reaper(int sig)
 {
 	int st;
 
@@ -360,8 +348,7 @@ int sig;
 		children--;
 }
 
-void terminate(sig)
-int sig;
+void terminate(int sig)
 {
 	struct _dom_binding *ypdb;
 	char path[MAXPATHLEN];
@@ -384,9 +371,7 @@ int sig;
 }
 
 int
-main(argc, argv)
-int argc;
-char **argv;
+main(int argc, char **argv)
 {
 	struct timeval tv;
 	int i;
@@ -509,7 +494,7 @@ char **argv;
 }
 
 void
-checkwork()
+checkwork(void)
 {
 	struct _dom_binding *ypdb;
 
@@ -529,8 +514,7 @@ checkwork()
  * doesn't always result in an error (otherwise I would have caught
  * the mistake much sooner), even though logically it should.
  */
-void handle_children(ypdb)
-struct _dom_binding *ypdb;
+void handle_children(struct _dom_binding *ypdb)
 {
 	char buf[YPMAXDOMAIN + 1];
 	struct sockaddr_in addr;
@@ -586,9 +570,7 @@ struct _dom_binding *ypdb;
  * Send our dying words back to our parent before we perish.
  */
 int
-tell_parent(dom, addr)
-char *dom;
-struct sockaddr_in *addr;
+tell_parent(char *dom, struct sockaddr_in *addr)
 {
 	char buf[YPMAXDOMAIN + 1];
 	struct timeval timeout;
@@ -621,9 +603,7 @@ struct sockaddr_in *addr;
 	return (0);
 }
 
-bool_t broadcast_result(out, addr)
-bool_t *out;
-struct sockaddr_in *addr;
+bool_t broadcast_result(caddr_t out, struct sockaddr_in *addr)
 {
 	if (retries >= MAX_RETRIES) {
 		bzero((char *)addr, sizeof(struct sockaddr_in));
@@ -654,8 +634,7 @@ struct sockaddr_in *addr;
  * the 'eachresult' callback function.
  */
 void
-broadcast(ypdb)
-struct _dom_binding *ypdb;
+broadcast(struct _dom_binding *ypdb)
 {
 	bool_t out = FALSE;
 	enum clnt_stat stat;
@@ -768,8 +747,7 @@ struct _dom_binding *ypdb;
  * need it to keep the system on its feet.
  */
 int
-ping(ypdb)
-struct _dom_binding *ypdb;
+ping(struct _dom_binding *ypdb)
 {
 	bool_t out;
 	struct timeval interval, timeout;
@@ -815,10 +793,7 @@ struct _dom_binding *ypdb;
 	return(0);
 }
 
-void rpc_received(dom, raddrp, force)
-char *dom;
-struct sockaddr_in *raddrp;
-int force;
+void rpc_received(char *dom, struct sockaddr_in *raddrp, int force)
 {
 	struct _dom_binding *ypdb, *prev = NULL;
 	struct iovec iov[2];
@@ -961,8 +936,7 @@ int force;
  * 1 if not matched.
  */
 int
-verify(addr)
-struct in_addr addr;
+verify(struct in_addr addr)
 {
 	int i;
 
@@ -979,8 +953,7 @@ struct in_addr addr;
  * resolve the specified hostnames.
  */
 void
-yp_restricted_mode(args)
-char *args;
+yp_restricted_mode(char *args)
 {
 	struct hostent *h;
 	int i = 0;
-- 
2.41.0