From owner-svn-src-all@FreeBSD.ORG  Sun Nov  6 18:49:49 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 256FD10657A0;
	Sun,  6 Nov 2011 18:49:48 +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 5D86F8FC22;
	Sun,  6 Nov 2011 18:49:48 +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 pA6InmLB036112;
	Sun, 6 Nov 2011 18:49:48 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6Inmbh036109;
	Sun, 6 Nov 2011 18:49:48 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201111061849.pA6Inmbh036109@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 6 Nov 2011 18:49:48 +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: r227241 - head/usr.bin/m4
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Nov 2011 18:49:49 -0000

Author: ed
Date: Sun Nov  6 18:49:48 2011
New Revision: 227241
URL: http://svn.freebsd.org/changeset/base/227241

Log:
  Mark global functions and/or variables in m4(1) static where possible.
  
  This allows compilers and static analyzers to more thorough analysis.

Modified:
  head/usr.bin/m4/gnum4.c
  head/usr.bin/m4/main.c

Modified: head/usr.bin/m4/gnum4.c
==============================================================================
--- head/usr.bin/m4/gnum4.c	Sun Nov  6 18:49:41 2011	(r227240)
+++ head/usr.bin/m4/gnum4.c	Sun Nov  6 18:49:48 2011	(r227241)
@@ -60,7 +60,7 @@ int mimic_gnu = 0;
  * Then M4PATH env variable
  */
 
-struct path_entry {
+static struct path_entry {
 	char *name;
 	struct path_entry *next;
 } *first, *last;

Modified: head/usr.bin/m4/main.c
==============================================================================
--- head/usr.bin/m4/main.c	Sun Nov  6 18:49:41 2011	(r227240)
+++ head/usr.bin/m4/main.c	Sun Nov  6 18:49:48 2011	(r227241)
@@ -99,7 +99,7 @@ char scommt[MAXCCHARS+1] = {SCOMMT};	/* 
 char ecommt[MAXCCHARS+1] = {ECOMMT};	/* end character for comment   */
 int synccpp;			/* Line synchronisation for C preprocessor */
 
-struct keyblk keywrds[] = {	/* m4 keywords to be installed */
+static const struct keyblk keywrds[] = { /* m4 keywords to be installed */
 	{ "include",      INCLTYPE },
 	{ "sinclude",     SINCTYPE },
 	{ "define",       DEFITYPE },