diff options
| author | Sami Kerola | 2014-07-26 16:19:26 +0200 |
|---|---|---|
| committer | Sami Kerola | 2014-07-28 22:15:18 +0200 |
| commit | 2e0fd22d5da49127167b2ff00d8e678a2bf8ac4b (patch) | |
| tree | 8a315d16b0c0eac5ea8689e23335506c9b8447ea /misc-utils/logger.c | |
| parent | logger: make --stderr print remote server messages (diff) | |
| download | kernel-qcow2-util-linux-2e0fd22d5da49127167b2ff00d8e678a2bf8ac4b.tar.gz kernel-qcow2-util-linux-2e0fd22d5da49127167b2ff00d8e678a2bf8ac4b.tar.xz kernel-qcow2-util-linux-2e0fd22d5da49127167b2ff00d8e678a2bf8ac4b.zip | |
logger: improve readablity of pencode() function
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'misc-utils/logger.c')
| -rw-r--r-- | misc-utils/logger.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/misc-utils/logger.c b/misc-utils/logger.c index 7239cc5b8..afd93712a 100644 --- a/misc-utils/logger.c +++ b/misc-utils/logger.c @@ -144,24 +144,22 @@ static int decode(char *name, CODE *codetab) static int pencode(char *s) { - char *save; - int fac, lev; - - for (save = s; *s && *s != '.'; ++s); - if (*s) { - *s = '\0'; - fac = decode(save, facilitynames); - if (fac < 0) - errx(EXIT_FAILURE, _("unknown facility name: %s"), save); - *s++ = '.'; - } else { - fac = LOG_USER; - s = save; - } - lev = decode(s, prioritynames); - if (lev < 0) - errx(EXIT_FAILURE, _("unknown priority name: %s"), save); - return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK)); + int facility, level; + char *separator; + + separator = strchr(s, '.'); + if (separator) { + *separator = '\0'; + facility = decode(s, facilitynames); + if (facility < 0) + errx(EXIT_FAILURE, _("unknown facility name: %s"), s); + s = ++separator; + } else + facility = LOG_USER; + level = decode(s, prioritynames); + if (level < 0) + errx(EXIT_FAILURE, _("unknown priority name: %s"), s); + return ((level & LOG_PRIMASK) | (facility & LOG_FACMASK)); } static int unix_socket(const char *path, const int socket_type) |