knf + ansi

ok henning@

1 files changed, 89 insertions, 97 deletions

diff --git a/usr.sbin/dhcpd/print.c b/usr.sbin/dhcpd/print.c
index 155d4c6a688..9ac209e2280 100644
--- a/usr.sbin/dhcpd/print.c
+++ b/usr.sbin/dhcpd/print.c
@@ -1,6 +1,6 @@
-/* print.c
+/*	$Id: print.c,v 1.3 2004/04/15 22:22:21 hshoexer Exp $	 */
 
-   Turn data structures into printable text. */
+/* Turn data structures into printable text. */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
@@ -42,157 +42,149 @@
 
 #include "dhcpd.h"
 
-char *print_hw_addr (htype, hlen, data)
-	int htype;
-	int hlen;
-	unsigned char *data;
+char *
+print_hw_addr(int htype, int hlen, unsigned char *data)
 {
-	static char habuf [49];
-	char *s;
-	int i;
+	static char     habuf[49];
+	char           *s;
+	int             i;
 
 	if (htype == 0 || hlen == 0) {
 		goto bad;
 	} else {
-		int slen = sizeof(habuf);
+		int	slen = sizeof(habuf);
 		s = habuf;
 		for (i = 0; i < hlen; i++) {
-			int j;
-			j = snprintf (s, slen, "%02x", data [i]);
+			int	j;
+			j = snprintf(s, slen, "%02x", data[i]);
 			if (j <= 0)
 				goto bad;
 
-			s += strlen (s);
+			s += strlen(s);
 			slen -= (strlen(s) + 1);
 			*s++ = ':';
 		}
 		*--s = 0;
 	}
 	return habuf;
- bad:
-	strlcpy (habuf, "<null>", sizeof habuf);
+bad:
+	strlcpy(habuf, "<null>", sizeof habuf);
 	return habuf;
 
 }
 
-void print_lease (lease)
-	struct lease *lease;
+void 
+print_lease(struct lease *lease)
 {
-	struct tm *t;
-	char tbuf [32];
-
-	debug ("      Lease %s",
-	       piaddr (lease -> ip_addr));
-
-	t = gmtime (&lease -> starts);
-	strftime (tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
-	debug ("        start %s", tbuf);
-
-	t = gmtime (&lease -> ends);
-	strftime (tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
-	debug ("        end %s", tbuf);
-
-	t = gmtime (&lease -> timestamp);
-	strftime (tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
-	debug ("        stamp %s", tbuf);
-
-	debug ("        hardware addr = %s",
-	       print_hw_addr (lease -> hardware_addr.htype,
-			       lease -> hardware_addr.hlen,
-			       lease -> hardware_addr.haddr));
-	debug ("        host %s  ",
-	       lease -> host ? lease -> host -> name : "<none>");
+	struct tm      *t;
+	char            tbuf[32];
+
+	debug("      Lease %s", piaddr(lease->ip_addr));
+
+	t = gmtime(&lease->starts);
+	strftime(tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
+	debug("        start %s", tbuf);
+
+	t = gmtime(&lease->ends);
+	strftime(tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
+	debug("        end %s", tbuf);
+
+	t = gmtime(&lease->timestamp);
+	strftime(tbuf, sizeof tbuf, "%Y/%m/%d %H:%M:%S", t);
+	debug("        stamp %s", tbuf);
+
+	debug("        hardware addr = %s",
+	    print_hw_addr(lease->hardware_addr.htype,
+	    lease->hardware_addr.hlen, lease->hardware_addr.haddr));
+	debug("        host %s  ", lease->host ? lease->host->name : "<none>");
 }
 
-void dump_packet (tp)
-	struct packet *tp;
+void 
+dump_packet(struct packet *tp)
 {
-	struct dhcp_packet *tdp = tp -> raw;
-
-	debug ("packet length %d", tp -> packet_length);
-	debug ("op = %d  htype = %d  hlen = %d  hops = %d",
-	       tdp -> op, tdp -> htype, tdp -> hlen, tdp -> hops);
-	debug ("xid = %x  secs = %d  flags = %x",
-	       tdp -> xid, tdp -> secs, tdp -> flags);
-	debug ("ciaddr = %s", inet_ntoa (tdp -> ciaddr));
-	debug ("yiaddr = %s", inet_ntoa (tdp -> yiaddr));
-	debug ("siaddr = %s", inet_ntoa (tdp -> siaddr));
-	debug ("giaddr = %s", inet_ntoa (tdp -> giaddr));
-	debug ("chaddr = %02x:%02x:%02x:%02x:%02x:%02x",
-	       ((unsigned char *)(tdp -> chaddr)) [0],
-	       ((unsigned char *)(tdp -> chaddr)) [1],
-	       ((unsigned char *)(tdp -> chaddr)) [2],
-	       ((unsigned char *)(tdp -> chaddr)) [3],
-	       ((unsigned char *)(tdp -> chaddr)) [4],
-	       ((unsigned char *)(tdp -> chaddr)) [5]);
-	debug ("filename = %s", tdp -> file);
-	debug ("server_name = %s", tdp -> sname);
-	if (tp -> options_valid) {
-		int i;
+	struct dhcp_packet *tdp = tp->raw;
+
+	debug("packet length %d", tp->packet_length);
+	debug("op = %d  htype = %d  hlen = %d  hops = %d", tdp->op, tdp->htype,
+	    tdp->hlen, tdp->hops);
+	debug("xid = %x  secs = %d  flags = %x", tdp->xid, tdp->secs,
+	    tdp->flags);
+	debug("ciaddr = %s", inet_ntoa(tdp->ciaddr));
+	debug("yiaddr = %s", inet_ntoa(tdp->yiaddr));
+	debug("siaddr = %s", inet_ntoa(tdp->siaddr));
+	debug("giaddr = %s", inet_ntoa(tdp->giaddr));
+	debug("chaddr = %02x:%02x:%02x:%02x:%02x:%02x",
+    	    ((unsigned char *)(tdp->chaddr))[0],
+	    ((unsigned char *)(tdp->chaddr))[1],
+	    ((unsigned char *)(tdp->chaddr))[2],
+	    ((unsigned char *)(tdp->chaddr))[3],
+	    ((unsigned char *)(tdp->chaddr))[4],
+	    ((unsigned char *)(tdp->chaddr))[5]);
+	debug("filename = %s", tdp->file);
+	debug("server_name = %s", tdp->sname);
+	if (tp->options_valid) {
+		int             i;
 
 		for (i = 0; i < 256; i++) {
-			if (tp -> options [i].data)
-				debug ("  %s = %s",
-					dhcp_options [i].name,
-					pretty_print_option
-					(i, tp -> options [i].data,
-					 tp -> options [i].len, 1, 1));
+			if (tp->options[i].data)
+				debug("  %s = %s", dhcp_options[i].name,
+				    pretty_print_option(i, tp->options[i].data,
+				    tp->options[i].len, 1, 1));
 		}
 	}
-	debug ("%s", "");
+	debug("%s", "");
 }
 
-void dump_raw (buf, len)
-	unsigned char *buf;
-	int len;
+void 
+dump_raw(unsigned char *buf, int len)
 {
-	int i, j;
-	char lbuf [80];
-	int llen = sizeof(lbuf);
-	int lbix = 0;
+	int             i, j;
+	char            lbuf[80];
+	int             llen = sizeof(lbuf);
+	int             lbix = 0;
 
-	lbuf [0] = 0;
+	lbuf[0] = 0;
 
 	for (i = 0; i < len; i++) {
 		if ((i & 15) == 0) {
 			if (lbix)
-				note (lbuf);
-			j = snprintf (lbuf, llen, "%03x:", i);
+				note(lbuf);
+			j = snprintf(lbuf, llen, "%03x:", i);
 			if (j >= llen)
 				return;
-			lbix+=j;
-			llen-=j;
+			lbix += j;
+			llen -= j;
 		} else if ((i & 7) == 0) {
-			lbuf [lbix++] = ' ';
+			lbuf[lbix++] = ' ';
 			len--;
 		}
-		j = snprintf (&lbuf [lbix], llen, " %02x", buf [i]);
+		j = snprintf(&lbuf[lbix], llen, " %02x", buf[i]);
 		if (j >= llen)
 			return;
 		lbix += j;
 		llen -= j;
 	}
-	note (lbuf);
+	note(lbuf);
 }
 
-void hash_dump (table)
-	struct hash_table *table;
+void 
+hash_dump(struct hash_table *table)
 {
-	int i;
+	int             i;
 	struct hash_bucket *bp;
 
 	if (!table)
 		return;
 
-	for (i = 0; i < table -> hash_count; i++) {
-		if (!table -> buckets [i])
+	for (i = 0; i < table->hash_count; i++) {
+		if (!table->buckets[i])
 			continue;
-		note ("hash bucket %d:", i);
-		for (bp = table -> buckets [i]; bp; bp = bp -> next) {
-			if (bp -> len)
-				dump_raw (bp -> name, bp -> len);
+		note("hash bucket %d:", i);
+		for (bp = table->buckets[i]; bp; bp = bp->next) {
+			if (bp->len)
+				dump_raw(bp->name, bp->len);
 			else
-				note ((char *)bp -> name);
+				note((char *) bp->name);
 		}
 	}
 }