[Midnightbsd-cvs] src [11567] trunk/usr.bin/cpuset/cpuset.c: sync with freebsd.

[laffer1 at midnightbsd.org]

Revision: 11567
          http://svnweb.midnightbsd.org/src/?rev=11567
Author:   laffer1
Date:     2018-07-07 19:16:05 -0400 (Sat, 07 Jul 2018)
Log Message:
-----------
sync with freebsd.

Modified Paths:
--------------
    trunk/usr.bin/cpuset/Makefile
    trunk/usr.bin/cpuset/cpuset.1
    trunk/usr.bin/cpuset/cpuset.c

Property Changed:
----------------
    trunk/usr.bin/cpuset/cpuset.1

Modified: trunk/usr.bin/cpuset/Makefile
===================================================================
--- trunk/usr.bin/cpuset/Makefile	2018-07-07 23:15:41 UTC (rev 11566)
+++ trunk/usr.bin/cpuset/Makefile	2018-07-07 23:16:05 UTC (rev 11567)
@@ -1,4 +1,5 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/cpuset/Makefile 201386 2010-01-02 10:27:05Z ed $
 
 PROG=   cpuset
 

Modified: trunk/usr.bin/cpuset/cpuset.1
===================================================================
--- trunk/usr.bin/cpuset/cpuset.1	2018-07-07 23:15:41 UTC (rev 11566)
+++ trunk/usr.bin/cpuset/cpuset.1	2018-07-07 23:16:05 UTC (rev 11567)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 2008 Christian Brueffer
 .\" Copyright (c) 2008 Jeffrey Roberson
 .\" All rights reserved.
@@ -23,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/cpuset/cpuset.1 217416 2011-01-14 19:57:28Z jhb $
 .\"
 .Dd January 14, 2011
 .Dt CPUSET 1


Property changes on: trunk/usr.bin/cpuset/cpuset.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/cpuset/cpuset.c
===================================================================
--- trunk/usr.bin/cpuset/cpuset.c	2018-07-07 23:15:41 UTC (rev 11566)
+++ trunk/usr.bin/cpuset/cpuset.c	2018-07-07 23:16:05 UTC (rev 11567)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * Copyright (c) 2007, 2008 	Jeffrey Roberson <jeff at freebsd.org>
  * All rights reserved.
@@ -28,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/cpuset/cpuset.c 227160 2011-11-06 08:14:40Z ed $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -46,22 +47,22 @@
 #include <unistd.h>
 #include <string.h>
 
-int Cflag;
-int cflag;
-int gflag;
-int iflag;
-int jflag;
-int lflag;
-int pflag;
-int rflag;
-int sflag;
-int tflag;
-int xflag;
-id_t id;
-cpulevel_t level;
-cpuwhich_t which;
+static int Cflag;
+static int cflag;
+static int gflag;
+static int iflag;
+static int jflag;
+static int lflag;
+static int pflag;
+static int rflag;
+static int sflag;
+static int tflag;
+static int xflag;
+static id_t id;
+static cpulevel_t level;
+static cpuwhich_t which;
 
-void usage(void);
+static void usage(void);
 
 static void printset(cpuset_t *mask);
 
@@ -161,8 +162,8 @@
 	printf("\n");
 }
 
-const char *whichnames[] = { NULL, "tid", "pid", "cpuset", "irq", "jail" };
-const char *levelnames[] = { NULL, " root", " cpuset", "" };
+static const char *whichnames[] = { NULL, "tid", "pid", "cpuset", "irq", "jail" };
+static const char *levelnames[] = { NULL, " root", " cpuset", "" };
 
 static void
 printaffinity(void)
@@ -343,7 +344,7 @@
 	exit(EXIT_SUCCESS);
 }
 
-void
+static void
 usage(void)
 {