From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 26 Jul 2014 14:19:26 +0000 (+0100)
Subject: logger: improve readablity of pencode() function
X-Git-Tag: v2.26-rc1~576^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e0fd22d5da49127167b2ff00d8e678a2bf8ac4b;p=thirdparty%2Futil-linux.git

logger: improve readablity of pencode() function

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 7239cc5b85..afd93712a2 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)