From d35fcc6826077658dbbed1f1248e83a290977349 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sun, 6 Nov 2011 19:01:41 +0000 Subject: [PATCH] Mark global functions and/or variables in chown(8) static where possible. This allows compilers and static analyzers to do more thorough analysis. --- usr.sbin/chown/chown.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c index e13235c3119..9780f02f048 100644 --- a/usr.sbin/chown/chown.c +++ b/usr.sbin/chown/chown.c @@ -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); +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); -uid_t uid; -gid_t gid; -int ischown; -const char *gname; +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) {