[Midnightbsd-cvs] src [10812] trunk/usr.sbin/devinfo/devinfo.c: sync

[laffer1 at midnightbsd.org]

Revision: 10812
          http://svnweb.midnightbsd.org/src/?rev=10812
Author:   laffer1
Date:     2018-06-10 14:11:51 -0400 (Sun, 10 Jun 2018)
Log Message:
-----------
sync

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

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

Modified: trunk/usr.sbin/devinfo/Makefile
===================================================================
--- trunk/usr.sbin/devinfo/Makefile	2018-06-10 18:11:07 UTC (rev 10811)
+++ trunk/usr.sbin/devinfo/Makefile	2018-06-10 18:11:51 UTC (rev 10812)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/devinfo/Makefile 201390 2010-01-02 11:07:44Z ed $
 
 PROG=	devinfo
 MAN=	devinfo.8

Modified: trunk/usr.sbin/devinfo/devinfo.8
===================================================================
--- trunk/usr.sbin/devinfo/devinfo.8	2018-06-10 18:11:07 UTC (rev 10811)
+++ trunk/usr.sbin/devinfo/devinfo.8	2018-06-10 18:11:51 UTC (rev 10812)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" -*- nroff -*-
 .\"
 .\" Copyright (c) 2002 Hiten Pandya
@@ -25,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/devinfo/devinfo.8 206622 2010-04-14 19:08:06Z uqs $
 .\"
 .Dd November 28, 2005
 .Dt DEVINFO 8


Property changes on: trunk/usr.sbin/devinfo/devinfo.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/devinfo/devinfo.c
===================================================================
--- trunk/usr.sbin/devinfo/devinfo.c	2018-06-10 18:11:07 UTC (rev 10811)
+++ trunk/usr.sbin/devinfo/devinfo.c	2018-06-10 18:11:51 UTC (rev 10812)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2000, 2001 Michael Smith
  * Copyright (c) 2000 BSDi
@@ -30,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/devinfo/devinfo.c 227252 2011-11-06 19:01:48Z ed $");
 
 #include <sys/types.h>
 #include <err.h>
@@ -39,8 +40,8 @@
 #include <unistd.h>
 #include "devinfo.h"
 
-int	rflag;
-int	vflag;
+static int	rflag;
+static int	vflag;
 
 static void	print_resource(struct devinfo_res *);
 static int	print_device_matching_resource(struct devinfo_res *, void *);