From owner-svn-src-head@FreeBSD.ORG  Sun Nov  6 16:47:51 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 39DFB106564A;
	Sun,  6 Nov 2011 16:47:51 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 10A2C8FC12;
	Sun,  6 Nov 2011 16:47:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA6GloMc030978;
	Sun, 6 Nov 2011 16:47:50 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6GloTs030976;
	Sun, 6 Nov 2011 16:47:50 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201111061647.pA6GloTs030976@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 6 Nov 2011 16:47:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227224 - head/usr.sbin/mptable
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Nov 2011 16:47:51 -0000

Author: ed
Date: Sun Nov  6 16:47:50 2011
New Revision: 227224
URL: http://svn.freebsd.org/changeset/base/227224

Log:
  Mark all global variables static for mptable(1).
  
  While there, remove basetableEntryTypes, which became unused in r71209.

Modified:
  head/usr.sbin/mptable/mptable.c

Modified: head/usr.sbin/mptable/mptable.c
==============================================================================
--- head/usr.sbin/mptable/mptable.c	Sun Nov  6 16:40:17 2011	(r227223)
+++ head/usr.sbin/mptable/mptable.c	Sun Nov  6 16:47:50 2011	(r227224)
@@ -96,7 +96,7 @@ typedef struct BUSTYPENAME {
     char	name[ 7 ];
 } busTypeName;
 
-static busTypeName busTypeTable[] =
+static const busTypeName busTypeTable[] =
 {
     { CBUS,		"CBUS"   },
     { CBUSII,		"CBUSII" },
@@ -119,7 +119,7 @@ static busTypeName busTypeTable[] =
     { UNKNOWN_BUSTYPE,	"---"    }
 };
 
-const char* whereStrings[] = {
+static const char *whereStrings[] = {
     "Extended BIOS Data Area",
     "BIOS top of memory",
     "Default top of memory",
@@ -135,16 +135,7 @@ typedef struct TABLE_ENTRY {
     char	name[ 32 ];
 } tableEntry;
 
-tableEntry basetableEntryTypes[] =
-{
-    { 0, 20, "Processor" },
-    { 1,  8, "Bus" },
-    { 2,  8, "I/O APIC" },
-    { 3,  8, "I/O INT" },
-    { 4,  8, "Local INT" }
-};
-
-tableEntry extendedtableEntryTypes[] =
+static const tableEntry extendedtableEntryTypes[] =
 {
     { 128, 20, "System Address Space" },
     { 129,  8, "Bus Hierarchy" },
@@ -277,19 +268,19 @@ static void doDmesg( void );
 static void pnstr( char* s, int c );
 
 /* global data */
-int	pfd;		/* physical /dev/mem fd */
+static int	pfd;		/* physical /dev/mem fd */
 
-int	busses[ 16 ];
-int	apics[ 16 ];
+static int	busses[16];
+static int	apics[16];
 
-int	ncpu;
-int	nbus;
-int	napic;
-int	nintr;
-
-int	dmesg;
-int	grope;
-int	verbose;
+static int	ncpu;
+static int	nbus;
+static int	napic;
+static int	nintr;
+
+static int	dmesg;
+static int	grope;
+static int	verbose;
 
 static void
 usage( void )
@@ -978,14 +969,14 @@ ioApicEntry( void )
 }
 
 
-const char* intTypes[] = {
+static const char *intTypes[] = {
     "INT", "NMI", "SMI", "ExtINT"
 };
 
-const char* polarityMode[] = {
+static const char *polarityMode[] = {
     "conforms", "active-hi", "reserved", "active-lo"
 };
-const char* triggerMode[] = {
+static const char *triggerMode[] = {
     "conforms", "edge", "reserved", "level"
 };