[Midnightbsd-cvs] src [10351] trunk/usr.sbin/rip6query/rip6query.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10351
          http://svnweb.midnightbsd.org/src/?rev=10351
Author:   laffer1
Date:     2018-06-03 18:55:14 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.sbin/rip6query/Makefile
    trunk/usr.sbin/rip6query/rip6query.8
    trunk/usr.sbin/rip6query/rip6query.c

Property Changed:
----------------
    trunk/usr.sbin/rip6query/rip6query.8

Modified: trunk/usr.sbin/rip6query/Makefile
===================================================================
--- trunk/usr.sbin/rip6query/Makefile	2018-06-03 22:54:32 UTC (rev 10350)
+++ trunk/usr.sbin/rip6query/Makefile	2018-06-03 22:55:14 UTC (rev 10351)
@@ -1,10 +1,10 @@
+# $MidnightBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD: src/usr.sbin/rip6query/Makefile,v 1.7 2006/07/27 15:31:12 yar Exp $
+#	$FreeBSD: stable/10/usr.sbin/rip6query/Makefile 201390 2010-01-02 11:07:44Z ed $
 
 PROG=	rip6query
 MAN=	rip6query.8
 
-WARNS?=	2
 CFLAGS+= -I${.CURDIR}/../route6d
 
 .include <bsd.prog.mk>

Modified: trunk/usr.sbin/rip6query/rip6query.8
===================================================================
--- trunk/usr.sbin/rip6query/rip6query.8	2018-06-03 22:54:32 UTC (rev 10350)
+++ trunk/usr.sbin/rip6query/rip6query.8	2018-06-03 22:55:14 UTC (rev 10351)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\"	$KAME: rip6query.8,v 1.4 2001/03/15 12:35:24 itojun Exp $
 .\"
 .\" Copyright (C) 1998 and 1999 WIDE Project.
@@ -27,8 +28,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: rip6query.8,v 1.1.1.2 2006-02-25 02:38:38 laffer1 Exp $
-.\" $FreeBSD: src/usr.sbin/rip6query/rip6query.8,v 1.7 2005/02/09 18:04:41 ru Exp $
+.\"     $Id: rip6query.8,v 1.2 2000/01/19 06:24:55 itojun Exp $
+.\" $FreeBSD: stable/10/usr.sbin/rip6query/rip6query.8 141580 2005-02-09 18:07:17Z ru $
 .\"
 .Dd October 7, 1999
 .Dt RIP6QUERY 8


Property changes on: trunk/usr.sbin/rip6query/rip6query.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/rip6query/rip6query.c
===================================================================
--- trunk/usr.sbin/rip6query/rip6query.c	2018-06-03 22:54:32 UTC (rev 10350)
+++ trunk/usr.sbin/rip6query/rip6query.c	2018-06-03 22:55:14 UTC (rev 10351)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*	$KAME: rip6query.c,v 1.11 2001/05/08 04:36:37 itojun Exp $	*/
 
 /*
@@ -28,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.sbin/rip6query/rip6query.c,v 1.8 2006/09/21 01:41:03 kan Exp $
+ * $FreeBSD: stable/10/usr.sbin/rip6query/rip6query.c 227258 2011-11-06 19:02:31Z ed $
  */
 
 #include <stdio.h>
@@ -56,21 +57,19 @@
 
 #include "route6d.h"
 
-int	s;
-struct sockaddr_in6 sin6;
-struct rip6	*ripbuf;
+static int	s;
+static struct sockaddr_in6 sin6;
+static struct rip6	*ripbuf;
 
 #define	RIPSIZE(n)	(sizeof(struct rip6) + (n-1) * sizeof(struct netinfo6))
 
-int main __P((int, char **));
-static void usage __P((void));
-static const char *sa_n2a __P((struct sockaddr *));
-static const char *inet6_n2a __P((struct in6_addr *));
+int main(int, char **);
+static void usage(void);
+static const char *sa_n2a(struct sockaddr *);
+static const char *inet6_n2a(struct in6_addr *);
 
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char *argv[])
 {
 	struct netinfo6 *np;
 	struct sockaddr_in6 fsock;
@@ -175,7 +174,7 @@
 }
 
 static void
-usage()
+usage(void)
 {
 	fprintf(stderr, "usage: rip6query [-I iface] address\n");
 }
@@ -182,8 +181,7 @@
 
 /* getnameinfo() is preferred as we may be able to show ifindex as ifname */
 static const char *
-sa_n2a(sa)
-	struct sockaddr *sa;
+sa_n2a(struct sockaddr *sa)
 {
 	static char buf[NI_MAXHOST];
 
@@ -195,8 +193,7 @@
 }
 
 static const char *
-inet6_n2a(addr)
-	struct in6_addr *addr;
+inet6_n2a(struct in6_addr *addr)
 {
 	static char buf[NI_MAXHOST];