From owner-svn-src-head@FreeBSD.ORG Sun Nov 6 19:01:42 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 34834106578A; Sun, 6 Nov 2011 19:01:42 +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 249638FC08; Sun, 6 Nov 2011 19:01:42 +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 pA6J1gIA036856; Sun, 6 Nov 2011 19:01:42 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6J1gTT036854; Sun, 6 Nov 2011 19:01:42 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201111061901.pA6J1gTT036854@svn.freebsd.org> From: Ed Schouten Date: Sun, 6 Nov 2011 19:01:42 +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: r227251 - head/usr.sbin/chown 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 19:01:42 -0000 Author: ed Date: Sun Nov 6 19:01:41 2011 New Revision: 227251 URL: http://svn.freebsd.org/changeset/base/227251 Log: Mark global functions and/or variables in chown(8) static where possible. This allows compilers and static analyzers to do more thorough analysis. Modified: head/usr.sbin/chown/chown.c Modified: head/usr.sbin/chown/chown.c ============================================================================== --- head/usr.sbin/chown/chown.c Sun Nov 6 19:01:35 2011 (r227250) +++ head/usr.sbin/chown/chown.c Sun Nov 6 19:01:41 2011 (r227251) @@ -57,16 +57,16 @@ __FBSDID("$FreeBSD$"); #include #include -void a_gid(const char *); -void a_uid(const char *); -void chownerr(const char *); -uid_t id(const char *, const char *); -void usage(void); - -uid_t uid; -gid_t gid; -int ischown; -const char *gname; +static void a_gid(const char *); +static void a_uid(const char *); +static void chownerr(const char *); +static uid_t id(const char *, const char *); +static void usage(void); + +static uid_t uid; +static gid_t gid; +static int ischown; +static const char *gname; int main(int argc, char **argv) @@ -229,7 +229,7 @@ main(int argc, char **argv) exit(rval); } -void +static void a_gid(const char *s) { struct group *gr; @@ -240,7 +240,7 @@ a_gid(const char *s) gid = ((gr = getgrnam(s)) != NULL) ? gr->gr_gid : id(s, "group"); } -void +static void a_uid(const char *s) { struct passwd *pw; @@ -250,7 +250,7 @@ a_uid(const char *s) uid = ((pw = getpwnam(s)) != NULL) ? pw->pw_uid : id(s, "user"); } -uid_t +static uid_t id(const char *name, const char *type) { uid_t val; @@ -267,7 +267,7 @@ id(const char *name, const char *type) return (val); } -void +static void chownerr(const char *file) { static uid_t euid = -1; @@ -299,7 +299,7 @@ chownerr(const char *file) warn("%s", file); } -void +static void usage(void) {