svn commit: r204405 - in head/sbin/routed: . rtquery

[Ulrich Spoerlein]

Author: uqs
Date: Sat Feb 27 10:17:27 2010
New Revision: 204405
URL: http://svn.freebsd.org/changeset/base/204405

Log:
  routed(8)/rtquery(8) bump/demote to WARNS=3 for all archs
  
  - The MACHINE_ARCH check is not exhaustive (missing at least powerpc),
    and generally not worth maintaining.
  - While here, fix whitespace and ordering of the Makefile
  
  PR:		bin/140081
  Approved by:	ed (co-mentor)

Modified:
  head/sbin/routed/Makefile
  head/sbin/routed/if.c
  head/sbin/routed/rtquery/Makefile

Modified: head/sbin/routed/Makefile
==============================================================================
--- head/sbin/routed/Makefile	Sat Feb 27 10:16:14 2010	(r204404)
+++ head/sbin/routed/Makefile	Sat Feb 27 10:17:27 2010	(r204405)
@@ -1,14 +1,13 @@
 # Make `routed` for FreeBSD
 # $FreeBSD$
 
-PROG=   routed
-SRCS=   if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
-MAN=   routed.8
-SUBDIR= rtquery
-LDADD=	-lmd
+PROG=	routed
+MAN=	routed.8
+SRCS=	if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
+WARNS?=	3
 DPADD=	${LIBMD}
-.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64" 
-WARNS?=	0
-.endif
+LDADD=	-lmd
+
+SUBDIR= rtquery
 
 .include <bsd.prog.mk>

Modified: head/sbin/routed/if.c
==============================================================================
--- head/sbin/routed/if.c	Sat Feb 27 10:16:14 2010	(r204404)
+++ head/sbin/routed/if.c	Sat Feb 27 10:17:27 2010	(r204405)
@@ -29,6 +29,8 @@
  * $FreeBSD$
  */
 
+#include <stdint.h>
+
 #include "defs.h"
 #include "pathnames.h"
 
@@ -948,9 +950,9 @@ ifinit(void)
 				} else if (now.tv_sec>(ifp->int_data.ts
 						       + CHECK_BAD_INTERVAL)) {
 					trace_act("interface %s has been off"
-						  " %ld seconds; forget it",
+						  " %jd seconds; forget it",
 						  ifp->int_name,
-						  (long)now.tv_sec-
+						  (intmax_t)now.tv_sec -
 						      ifp->int_data.ts);
 					ifdel(ifp);
 				}

Modified: head/sbin/routed/rtquery/Makefile
==============================================================================
--- head/sbin/routed/rtquery/Makefile	Sat Feb 27 10:16:14 2010	(r204404)
+++ head/sbin/routed/rtquery/Makefile	Sat Feb 27 10:17:27 2010	(r204405)
@@ -6,6 +6,6 @@ PROG=	rtquery
 MAN=	rtquery.8
 LDADD=	-lmd
 DPADD=	${LIBMD}
-WARNS?=	0
+WARNS?=	3
 
 .include <bsd.prog.mk>