Make this WARNS 2 clean, and fix up the manual page:

Avoid implicit function calls by adding the proper include files.
Use const char copyright.
Fix some fprint formatting.

In the manual page:

Use the .Pa macro for filenames and locations.
Kill hard setence breaks.
Make use of the .Tn and .Dq macros.
Add some to text to the otherwise blank HISTORY section (taken from CVS).

12 files changed, 59 insertions, 32 deletions

diff --git a/usr.sbin/IPXrouted/IPXrouted.8 b/usr.sbin/IPXrouted/IPXrouted.8
index 117a4ab..54ba41b 100644
--- a/usr.sbin/IPXrouted/IPXrouted.8
+++ b/usr.sbin/IPXrouted/IPXrouted.8
@@ -50,15 +50,22 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility is invoked at boot time to manage the IPX routing tables.
-The IPX routing daemon uses the Novell IPX Routing
-Information Protocol in maintaining up to date kernel routing
+utility is invoked at boot time to manage the
+.Tn IPX
+routing tables.
+The
+.Tn IPX
+routing daemon uses the Novell
+.Tn IPX
+Routing Information Protocol in maintaining up to date kernel routing
 table entries.
 .Pp
 Available options:
 .Bl -tag -width logfile
 .It Fl N
-Do not reply on GetNearestServer SAP request.
+Do not reply on GetNearestServer
+.Tn SAP
+request.
 .It Fl q
 Do not supply routing information (opposite of
 .Fl s
@@ -70,21 +77,23 @@ to supply routing information whether it is acting as an internetwork
 router or not.
 .It Fl S
 Do not supply Service Advertising Protocol
-(SAP)
+.Tn SAP
 information.
 The default is to supply
-SAP
+.Tn SAP
 information.
 .It Fl t
 All packets sent or received are
-printed on the standard output.  In addition,
+printed on the standard output.
+In addition,
 .Nm
 will not divorce itself from the controlling terminal
 so that interrupts from the keyboard will kill the process.
 .It Ar logfile
 Name of file in which
 .Nm Ns 's
-actions should be logged.  This log contains information
+actions should be logged.
+This log contains information
 about any changes to the routing tables and a history of
 recent messages sent and received which are related to
 the changed route.
@@ -93,8 +102,11 @@ the changed route.
 In normal operation
 .Nm
 listens
-for routing information packets.  If the host is connected to
-multiple IPX networks, it periodically supplies copies
+for routing information packets.
+If the host is connected to
+multiple
+.Tn IPX
+networks, it periodically supplies copies
 of its routing tables to any directly connected hosts
 and networks.
 .Pp
@@ -107,8 +119,8 @@ to find those
 directly connected interfaces configured into the
 system and marked
 .Dq up
-(the software loopback interface
-is ignored).  If multiple interfaces
+(the software loopback interface is ignored).
+If multiple interfaces
 are present, it is assumed the host will forward packets
 between networks.
 The
@@ -128,7 +140,8 @@ When a
 packet is received,
 .Nm
 formulates a reply based on the information maintained in its
-internal tables.  The
+internal tables.
+The
 .Em response
 packet generated contains a list of known routes, each marked
 with a
@@ -148,11 +161,13 @@ conditions is satisfied:
 .Bl -bullet
 .It
 No routing table entry exists for the destination network
-or host, and the metric indicates the destination is ``reachable''
+or host, and the metric indicates the destination is
+.Dq reachable
 (i.e. the hop count is not infinite).
 .It
 The source host of the packet is the same as the router in the
-existing routing table entry.  That is, updated information is
+existing routing table entry.
+That is, updated information is
 being received from the very internetwork router through which
 packets for the destination are being routed.
 .It
@@ -181,7 +196,8 @@ In addition to processing incoming packets,
 .Nm
 also periodically checks the routing table entries.
 If an entry has not been updated for 3 minutes, the entry's metric
-is set to infinity and marked for deletion.  Deletions are delayed
+is set to infinity and marked for deletion.
+Deletions are delayed
 an additional 60 seconds to insure the invalidation is propagated
 to other routers.
 .Pp
@@ -191,8 +207,16 @@ and networks.
 .Pp
 If
 .Nm
-receives a SIGINFO signal the current contents of the RIP and SAP
-tables are appended to the file /var/log/ipxrouted.dmp.
+receives a SIGINFO signal the current contents of the
+.Tn RIP
+and
+.Tn SAP
+tables are appended to the file
+.Pa /var/log/ipxrouted.dmp .
 .Sh SEE ALSO
 .Xr ipx 3
 .Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 2.2 .
diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile
index 374782d..b344345 100644
--- a/usr.sbin/IPXrouted/Makefile
+++ b/usr.sbin/IPXrouted/Makefile
@@ -6,6 +6,8 @@ MAN=	IPXrouted.8
 SRCS=	af.c if.c input.c main.c output.c startup.c tables.c timer.c trace.c
 SRCS+=  sap_input.c sap_tables.c sap_output.c
 
+WARNS?= 2
+
 DPADD=	${LIBCOMPAT} ${LIBIPX}
 LDADD=	-lcompat -lipx
 
diff --git a/usr.sbin/IPXrouted/af.c b/usr.sbin/IPXrouted/af.c
index 74455df..312f13d 100644
--- a/usr.sbin/IPXrouted/af.c
+++ b/usr.sbin/IPXrouted/af.c
@@ -39,7 +39,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)af.c	8.1 (Berkeley) 6/5/93";
+static const char sccsid[] = "@(#)af.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.sbin/IPXrouted/if.c b/usr.sbin/IPXrouted/if.c
index 7b914e7..2c6e664 100644
--- a/usr.sbin/IPXrouted/if.c
+++ b/usr.sbin/IPXrouted/if.c
@@ -38,7 +38,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)if.c	8.1 (Berkeley) 6/5/93";
+static const char sccsid[] = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/IPXrouted/input.c b/usr.sbin/IPXrouted/input.c
index b971326..651a8ae 100644
--- a/usr.sbin/IPXrouted/input.c
+++ b/usr.sbin/IPXrouted/input.c
@@ -39,7 +39,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/5/93";
+static const char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/IPXrouted/main.c b/usr.sbin/IPXrouted/main.c
index 91fe635..4e2af23 100644
--- a/usr.sbin/IPXrouted/main.c
+++ b/usr.sbin/IPXrouted/main.c
@@ -39,13 +39,13 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1985, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/5/93";
+static const char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/IPXrouted/output.c b/usr.sbin/IPXrouted/output.c
index 1e60fc8..78922c9 100644
--- a/usr.sbin/IPXrouted/output.c
+++ b/usr.sbin/IPXrouted/output.c
@@ -39,7 +39,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/5/93";
+static const char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/IPXrouted/sap_tables.c b/usr.sbin/IPXrouted/sap_tables.c
index df2fc4b..e1572d1 100644
--- a/usr.sbin/IPXrouted/sap_tables.c
+++ b/usr.sbin/IPXrouted/sap_tables.c
@@ -32,6 +32,7 @@
  */
 
 #include "defs.h"
+#include <search.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -123,7 +124,6 @@ struct sap_entry *
 sap_nearestserver(ushort ServType, struct interface *ifp)
 {
 	register struct sap_entry *sap;
-	register struct sap_entry *csap;
 	struct sap_hash  *sh;
 	register struct sap_entry *best = NULL;
 	register int besthops = HOPCNT_INFINITY;
@@ -139,7 +139,6 @@ sap_nearestserver(ushort ServType, struct interface *ifp)
 				best = sap;
 				besthops = ntohs(best->sap.hops);
 			}
-next:;
 		}
 	return best;
 }
@@ -283,7 +282,7 @@ sap_add_clone(struct sap_entry *sap,
 		return;
 
 	if (ftrace)
-		fprintf(ftrace, "CLONE ADD %04.4X %s.\n", 
+		fprintf(ftrace, "CLONE ADD %4.4X %s.\n", 
 			ntohs(clone->ServType),
 			clone->ServName);
 
diff --git a/usr.sbin/IPXrouted/startup.c b/usr.sbin/IPXrouted/startup.c
index 1740a88..5c87de0 100644
--- a/usr.sbin/IPXrouted/startup.c
+++ b/usr.sbin/IPXrouted/startup.c
@@ -39,7 +39,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)startup.c	8.1 (Berkeley) 6/5/93";
+static const char sccsid[] = "@(#)startup.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
 /*
@@ -57,6 +57,7 @@ static char sccsid[] = "@(#)startup.c	8.1 (Berkeley) 6/5/93";
 
 #include <errno.h>
 #include <nlist.h>
+#include <search.h>
 #include <stdlib.h>
 
 struct	interface *ifnet;
@@ -254,7 +255,7 @@ addrouteforif(ifp)
 		match = afswitch[dst->sa_family].af_netmatch;
 		if (match)
 		for (ifp2 = ifnet; ifp2; ifp2 =ifp2->int_next) {
-			if (ifp->int_flags & IFF_POINTOPOINT == 0)
+			if ((ifp->int_flags & IFF_POINTOPOINT) == 0)
 				continue;
 			if ((*match)(&ifp2->int_dstaddr,&ifp->int_dstaddr)) {
 				insque(&ifp2->int_sq,&ifp->int_sq);
diff --git a/usr.sbin/IPXrouted/tables.c b/usr.sbin/IPXrouted/tables.c
index 8801b11..fee3921 100644
--- a/usr.sbin/IPXrouted/tables.c
+++ b/usr.sbin/IPXrouted/tables.c
@@ -36,7 +36,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 6/5/93";
+static const char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
 /*
@@ -45,6 +45,7 @@ static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 6/5/93";
 #include "defs.h"
 #include <sys/ioctl.h>
 #include <errno.h>
+#include <search.h>
 #include <stdlib.h>
 #include <unistd.h>
 
diff --git a/usr.sbin/IPXrouted/timer.c b/usr.sbin/IPXrouted/timer.c
index 8b31c1d..2159730 100644
--- a/usr.sbin/IPXrouted/timer.c
+++ b/usr.sbin/IPXrouted/timer.c
@@ -39,7 +39,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)timer.c	8.1 (Berkeley) 6/5/93";
+static const char sccsid[] = "@(#)timer.c	8.1 (Berkeley) 6/5/93";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/IPXrouted/trace.c b/usr.sbin/IPXrouted/trace.c
index 36f8047..47a576d 100644
--- a/usr.sbin/IPXrouted/trace.c
+++ b/usr.sbin/IPXrouted/trace.c
@@ -500,7 +500,7 @@ union ipx_net val;
 {
 	static char buf[100];
 	net.net_e = val;
-	(void)sprintf(buf, "%lx", ntohl(net.long_e));
+	(void)sprintf(buf, "%u", ntohl(net.long_e));
 	return (buf);
 }