From owner-svn-src-head@FreeBSD.ORG Sun Nov 6 08:18:00 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 83CA510660CA; Sun, 6 Nov 2011 08:18:00 +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 1A6E18FC15; Sun, 6 Nov 2011 08:18:00 +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 pA68Hxsp009437; Sun, 6 Nov 2011 08:17:59 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA68HxKQ009435; Sun, 6 Nov 2011 08:17:59 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111060817.pA68HxKQ009435@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 08:17:59 +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: r227191 - head/usr.bin/uname 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 08:18:00 -0000 Author: ed Date: Sun Nov 6 08:17:59 2011 New Revision: 227191 URL: http://svn.freebsd.org/changeset/base/227191 Log: Add missing static keywords to uname(1) Modified: head/usr.bin/uname/uname.c Modified: head/usr.bin/uname/uname.c ============================================================================== --- head/usr.bin/uname/uname.c Sun Nov 6 08:17:53 2011 (r227190) +++ head/usr.bin/uname/uname.c Sun Nov 6 08:17:59 2011 (r227191) @@ -63,21 +63,22 @@ static const char sccsid[] = "@(#)uname. #define IFLAG 0x40 typedef void (*get_t)(void); -get_t get_ident, get_platform, get_hostname, get_arch, get_release, get_sysname, get_version; +static get_t get_ident, get_platform, get_hostname, get_arch, + get_release, get_sysname, get_version; -void native_ident(void); -void native_platform(void); -void native_hostname(void); -void native_arch(void); -void native_release(void); -void native_sysname(void); -void native_version(void); -void print_uname(u_int); -void setup_get(void); -void usage(void); +static void native_ident(void); +static void native_platform(void); +static void native_hostname(void); +static void native_arch(void); +static void native_release(void); +static void native_sysname(void); +static void native_version(void); +static void print_uname(u_int); +static void setup_get(void); +static void usage(void); -char *ident, *platform, *hostname, *arch, *release, *sysname, *version; -int space; +static char *ident, *platform, *hostname, *arch, *release, *sysname, *version; +static int space; int main(int argc, char *argv[]) @@ -142,7 +143,7 @@ do { \ } \ } while (0) -void +static void setup_get(void) { CHECK_ENV("s", sysname); @@ -165,7 +166,7 @@ setup_get(void) printf("%s", var); \ } -void +static void print_uname(u_int flags) { PRINT_FLAG(flags, SFLAG, sysname); @@ -179,7 +180,7 @@ print_uname(u_int flags) } #define NATIVE_SYSCTL2_GET(var,mib0,mib1) \ -void \ +static void \ native_##var(void) \ { \ int mib[] = { (mib0), (mib1) }; \ @@ -193,7 +194,7 @@ native_##var(void) \ err(1, "sysctl"); #define NATIVE_SYSCTLNAME_GET(var,name) \ -void \ +static void \ native_##var(void) \ { \ size_t len; \ @@ -242,7 +243,7 @@ NATIVE_SYSCTL2_GET(arch, CTL_HW, HW_MACH NATIVE_SYSCTLNAME_GET(ident, "kern.ident") { } NATIVE_SET; -void +static void usage(void) { fprintf(stderr, "usage: uname [-aimnoprsv]\n");