From owner-svn-src-head@FreeBSD.ORG Sun Nov 6 18:49:12 2011 Return-Path: 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 03EB61065704; Sun, 6 Nov 2011 18:49:10 +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 7E33C8FC15; Sun, 6 Nov 2011 18:49:10 +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 pA6InA1e035873; Sun, 6 Nov 2011 18:49:10 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6InAD6035871; Sun, 6 Nov 2011 18:49:10 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111061849.pA6InAD6035871@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 18:49:10 +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: r227235 - head/usr.bin/comm 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 18:49:12 -0000 Author: ed Date: Sun Nov 6 18:49:10 2011 New Revision: 227235 URL: http://svn.freebsd.org/changeset/base/227235 Log: Mark global functions and/or variables in comm(1) static where possible. This allows compilers and static analyzers to more thorough analysis. Modified: head/usr.bin/comm/comm.c Modified: head/usr.bin/comm/comm.c ============================================================================== --- head/usr.bin/comm/comm.c Sun Nov 6 18:49:03 2011 (r227234) +++ head/usr.bin/comm/comm.c Sun Nov 6 18:49:10 2011 (r227235) @@ -57,12 +57,12 @@ __FBSDID("$FreeBSD$"); #include #include -int iflag; -const char *tabs[] = { "", "\t", "\t\t" }; +static int iflag; +static const char *tabs[] = { "", "\t", "\t\t" }; -FILE *file(const char *); -wchar_t *convert(const char *); -void show(FILE *, const char *, const char *, char **, size_t *); +static FILE *file(const char *); +static wchar_t *convert(const char *); +static void show(FILE *, const char *, const char *, char **, size_t *); static void usage(void); int @@ -189,7 +189,7 @@ main(int argc, char *argv[]) exit(0); } -wchar_t * +static wchar_t * convert(const char *str) { size_t n; @@ -212,7 +212,7 @@ convert(const char *str) return (buf); } -void +static void show(FILE *fp, const char *fn, const char *offset, char **bufp, size_t *buflenp) { ssize_t n; @@ -228,7 +228,7 @@ show(FILE *fp, const char *fn, const cha err(1, "%s", fn); } -FILE * +static FILE * file(const char *name) { FILE *fp;