diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-11-26 12:12:27 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-11-26 12:12:27 +0100 |
| commit | 4d8ad381abe9a37a8e2abc4d27afb0dea78b4f76 (patch) | |
| tree | e5d5a6bd444fa89fd0c48215a54e2e20546a3a95 /miscutils | |
| parent | 924a179cb7fb910a9e4a13d9ef124d224b6c152b (diff) | |
devfsd: remove static variable
function old new delta
static.msg 4 - -4
get_uid_gid 114 107 -7
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-11) Total: -11 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/devfsd.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 24c953bac..96ffe0738 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c @@ -1083,21 +1083,23 @@ static int get_uid_gid(int flag, const char *string) { struct passwd *pw_ent; struct group *grp_ent; - static const char *msg; + const char *msg; - if (ENABLE_DEVFSD_VERBOSE) - msg = "user"; - - if (isdigit(string[0]) ||((string[0] == '-') && isdigit(string[1]))) + if (isdigit(string[0]) || ((string[0] == '-') && isdigit(string[1]))) return atoi(string); if (flag == UID && (pw_ent = getpwnam(string)) != NULL) return pw_ent->pw_uid; - if (flag == GID && (grp_ent = getgrnam(string)) != NULL) - return grp_ent->gr_gid; - else if (ENABLE_DEVFSD_VERBOSE) - msg = "group"; + if (ENABLE_DEVFSD_VERBOSE) + msg = "user"; + + if (flag == GID) { + if ((grp_ent = getgrnam(string)) != NULL) + return grp_ent->gr_gid; + if (ENABLE_DEVFSD_VERBOSE) + msg = "group"; + } if (ENABLE_DEVFSD_VERBOSE) msg_logger(LOG_ERR, "unknown %s: %s, defaulting to %cid=0", msg, string, msg[0]); |