logger: simplify if clause [oclint]

This has effect of collapsing rather long indentation block, so commit
separately.

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

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 70fac68bb33d46081932d37128e7e0c1a45cbd0a..dbb9cdc24ecd742d92bd9ef48eabf9209a167ddd 100644 (file)
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -924,32 +924,32 @@ static void logger_stdin(struct logger_ctl *ctl)
        c = getchar();
        while (c != EOF) {
                i = 0;
-               if (ctl->prio_prefix) {
-                       if (c == '<') {
-                               pri = 0;
+               if (ctl->prio_prefix && c == '<') {
+                       pri = 0;
+                       buf[i++] = c;
+                       while (isdigit(c = getchar()) && pri <= 191) {
+                               buf[i++] = c;
+                               pri = pri * 10 + c - '0';
+                       }
+                       if (c != EOF && c != '\n')
                                buf[i++] = c;
-                               while (isdigit(c = getchar()) && pri <= 191) {
-                                       buf[i++] = c;
-                                       pri = pri * 10 + c - '0';
-                               }
-                               if (c != EOF && c != '\n')
-                                       buf[i++] = c;
-                               if (c == '>' && 0 <= pri && pri <= 191) { /* valid RFC PRI values */
-                                       i = 0;
-                                       if (pri < 8)
-                                               pri |= 8; /* kern facility is forbidden */
-                                       ctl->pri = pri;
-                               } else
-                                       ctl->pri = default_priority;
-
-                               if (ctl->pri != last_pri) {
-                                       has_header = 0;
-                                       max_usrmsg_size = ctl->max_message_size - strlen(ctl->hdr);
-                                       last_pri = ctl->pri;
-                               }
-                               if (c != EOF && c != '\n')
-                                       c = getchar();
+                       if (c == '>' && 0 <= pri && pri <= 191) {
+                               /* valid RFC PRI values */
+                               i = 0;
+                               if (pri < 8)    /* kern facility is forbidden */
+                                       pri |= 8;
+                               ctl->pri = pri;
+                       } else
+                               ctl->pri = default_priority;
+
+                       if (ctl->pri != last_pri) {
+                               has_header = 0;
+                               max_usrmsg_size =
+                                   ctl->max_message_size - strlen(ctl->hdr);
+                               last_pri = ctl->pri;
                        }
+                       if (c != EOF && c != '\n')
+                               c = getchar();
                }
 
                while (c != EOF && c != '\n' && i < max_usrmsg_size) {