logger: tidy few indentation issues

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

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 9613b951e854c9d54f53cc4d91030bfbbbe8b4e3..fccd39cd1e83b46a1aa1d7510775d465c2a3674f 100644 (file)
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -160,8 +160,8 @@ static int pencode(char *s)
        level = decode(s, prioritynames);
        if (level < 0)
                errx(EXIT_FAILURE, _("unknown priority name: %s"), s);
-       if(facility == LOG_KERN)
-               facility = LOG_USER; /* kern is forbidden */
+       if (facility == LOG_KERN)
+               facility = LOG_USER;    /* kern is forbidden */
        return ((level & LOG_PRIMASK) | (facility & LOG_FACMASK));
 }
 
@@ -295,21 +295,21 @@ static char *xgetlogin(void)
        return cp;
 }
 
-
 /* this creates a timestamp based on current time according to the
  * fine rules of RFC3164, most importantly it ensures in a portable
  * way that the month day is correctly written (with a SP instead
  * of a leading 0). The function uses a static buffer which is
  * overwritten on the next call (just like ctime() does).
  */
-static const char *
-rfc3164_current_time(void)
+static const char *rfc3164_current_time(void)
 {
        static char time[32];
        struct timeval tv;
        struct tm *tm;
-       static char *monthnames[] = { "Jan", "Feb", "Mar", "Apr",
-                       "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+       static char *monthnames[] = {
+               "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
+               "Sep", "Oct", "Nov", "Dec"
+       };
 
        gettimeofday(&tv, NULL);
        tm = localtime(&tv.tv_sec);
@@ -330,16 +330,15 @@ static void write_output(const struct logger_ctl *ctl, const char *const msg)
        const size_t len = xasprintf(&buf, "%s%s", ctl->hdr, msg);
        if (write_all(ctl->fd, buf, len) < 0)
                warn(_("write failed"));
-       else
-               if (ctl->socket_type == TYPE_TCP)
-                       /* using an additional write seems like the best compromise:
-                        * - writev() is not yet supported by framework
-                        * - adding the \n to the buffer in formatters violates layers
-                        * - adding \n after the fact requires memory copy
-                        * - logger is not a high-performance app
-                        */
-                       if (write_all(ctl->fd, "\n", 1) < 0)
-                               warn(_("write failed"));
+       else if (ctl->socket_type == TYPE_TCP)
+               /* using an additional write seems like the best compromise:
+                * - writev() is not yet supported by framework
+                * - adding the \n to the buffer in formatters violates layers
+                * - adding \n after the fact requires memory copy
+                * - logger is not a high-performance app
+                */
+               if (write_all(ctl->fd, "\n", 1) < 0)
+                       warn(_("write failed"));
        if (ctl->stderr_printout)
                fprintf(stderr, "%s\n", buf);
 }
@@ -388,29 +387,35 @@ static void syslog_rfc3164_header(struct logger_ctl *const ctl)
 #define NILVALUE "-"
 static void syslog_rfc5424_header(struct logger_ctl *const ctl)
 {
+       char *time;
+       char *hostname;
+       char *const app_name = ctl->tag;
+       char *procid;
+       char *const msgid = xstrdup(ctl->msgid ? ctl->msgid : NILVALUE);
+       char *structured_data;
+
        if (ctl->fd < 0)
                return;
 
-       char *time;
        if (ctl->rfc5424_time) {
                struct timeval tv;
                struct tm *tm;
+
                gettimeofday(&tv, NULL);
                if ((tm = localtime(&tv.tv_sec)) != NULL) {
                        char fmt[64];
                        const size_t i = strftime(fmt, sizeof(fmt),
-                                       "%Y-%m-%dT%H:%M:%S.%%06u%z ", tm);
+                                                 "%Y-%m-%dT%H:%M:%S.%%06u%z ", tm);
                        /* patch TZ info to comply with RFC3339 (we left SP at end) */
-                       fmt[i-1] = fmt[i-2];
-                       fmt[i-2] = fmt[i-3];
-                       fmt[i-3] = ':';
+                       fmt[i - 1] = fmt[i - 2];
+                       fmt[i - 2] = fmt[i - 3];
+                       fmt[i - 3] = ':';
                        xasprintf(&time, fmt, tv.tv_usec);
                } else
                        err(EXIT_FAILURE, _("localtime() failed"));
        } else
                time = xstrdup(NILVALUE);
 
-       char *hostname;
        if (ctl->rfc5424_host) {
                hostname = xgethostname();
                /* Arbitrary looking 'if (var < strlen()) checks originate from
@@ -421,22 +426,18 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl)
        } else
                hostname = xstrdup(NILVALUE);
 
-       char *const app_name = ctl->tag;
        if (48 < strlen(ctl->tag))
                errx(EXIT_FAILURE, _("tag '%s' is too long"), ctl->tag);
 
-       char *procid;
        if (ctl->pid)
                xasprintf(&procid, "%d", ctl->pid);
        else
                procid = xstrdup(NILVALUE);
 
-       char *const msgid = xstrdup((ctl->msgid) ? ctl->msgid : NILVALUE);
-
-       char *structured_data;
        if (ctl->rfc5424_tq) {
 #ifdef HAVE_NTP_GETTIME
                struct ntptimeval ntptv;
+
                if (ntp_gettime(&ntptv) == TIME_OK)
                        xasprintf(&structured_data,
                                 "[timeQuality tzKnown=\"1\" isSynced=\"1\" syncAccuracy=\"%ld\"]",
@@ -528,8 +529,8 @@ static void logger_open(struct logger_ctl *ctl)
        ctl->fd = unix_socket(ctl, ctl->unix_socket, ctl->socket_type);
        if (!ctl->syslogfp)
                ctl->syslogfp = syslog_local_header;
-       if(!ctl->tag)
-                       ctl->tag = xgetlogin();
+       if (!ctl->tag)
+               ctl->tag = xgetlogin();
        generate_syslog_header(ctl);
 }
 
@@ -582,9 +583,9 @@ static void logger_stdin(struct logger_ctl *ctl)
                        if (c == '<') {
                                pri = 0;
                                buf[i++] = c;
-                               while(isdigit(c = getchar()) && pri <= 191) {
-                                               buf[i++] = c;
-                                               pri = pri * 10 + c - '0';
+                               while (isdigit(c = getchar()) && pri <= 191) {
+                                       buf[i++] = c;
+                                       pri = pri * 10 + c - '0';
                                }
                                if (c != EOF && c != '\n')
                                        buf[i++] = c;
@@ -612,10 +613,10 @@ static void logger_stdin(struct logger_ctl *ctl)
                }
                buf[i] = '\0';
 
-               if(i > 0 || !ctl->skip_empty_lines)
+               if (i > 0 || !ctl->skip_empty_lines)
                        write_output(ctl, buf);
 
-               if (c == '\n') /* discard line terminator */
+               if (c == '\n')  /* discard line terminator */
                        c = getchar();
        }
 }
@@ -702,29 +703,29 @@ int main(int argc, char **argv)
        FILE *jfd = NULL;
 #endif
        static const struct option longopts[] = {
-               { "id",         optional_argument,  0, OPT_ID },
-               { "stderr",     no_argument,        0, 's' },
-               { "file",       required_argument,  0, 'f' },
-               { "priority",   required_argument,  0, 'p' },
-               { "tag",        required_argument,  0, 't' },
-               { "socket",     required_argument,  0, 'u' },
+               { "id",            optional_argument, 0, OPT_ID            },
+               { "stderr",        no_argument,       0, 's'               },
+               { "file",          required_argument, 0, 'f'               },
+               { "priority",      required_argument, 0, 'p'               },
+               { "tag",           required_argument, 0, 't'               },
+               { "socket",        required_argument, 0, 'u'               },
                { "socket-errors", required_argument, 0, OPT_SOCKET_ERRORS },
-               { "udp",        no_argument,        0, 'd' },
-               { "tcp",        no_argument,        0, 'T' },
-               { "server",     required_argument,  0, 'n' },
-               { "port",       required_argument,  0, 'P' },
-               { "version",    no_argument,        0, 'V' },
-               { "help",       no_argument,        0, 'h' },
-               { "prio-prefix", no_argument, 0, OPT_PRIO_PREFIX },
-               { "rfc3164",    no_argument,  0, OPT_RFC3164 },
-               { "rfc5424",    optional_argument,  0, OPT_RFC5424 },
-               { "size",       required_argument,  0, 'S' },
-               { "msgid",      required_argument,  0, OPT_MSGID },
-               { "skip-empty", no_argument,  0, 'e' },
+               { "udp",           no_argument,       0, 'd'               },
+               { "tcp",           no_argument,       0, 'T'               },
+               { "server",        required_argument, 0, 'n'               },
+               { "port",          required_argument, 0, 'P'               },
+               { "version",       no_argument,       0, 'V'               },
+               { "help",          no_argument,       0, 'h'               },
+               { "prio-prefix",   no_argument,       0, OPT_PRIO_PREFIX   },
+               { "rfc3164",       no_argument,       0, OPT_RFC3164       },
+               { "rfc5424",       optional_argument, 0, OPT_RFC5424       },
+               { "size",          required_argument, 0, 'S'               },
+               { "msgid",         required_argument, 0, OPT_MSGID         },
+               { "skip-empty",    no_argument,       0, 'e'               },
 #ifdef HAVE_LIBSYSTEMD
-               { "journald",   optional_argument,  0, OPT_JOURNALD },
+               { "journald",      optional_argument, 0, OPT_JOURNALD      },
 #endif
-               { NULL,         0, 0, 0 }
+               { NULL,            0,                 0, 0                 }
        };
 
        setlocale(LC_ALL, "");
@@ -801,8 +802,8 @@ int main(int argc, char **argv)
                                parse_rfc5424_flags(&ctl, optarg);
                        break;
                case OPT_MSGID:
-                       if(strchr(optarg, ' '))
-                                       err(EXIT_FAILURE, _("--msgid cannot contain space"));
+                       if (strchr(optarg, ' '))
+                               err(EXIT_FAILURE, _("--msgid cannot contain space"));
                        ctl.msgid = optarg;
                        break;
 #ifdef HAVE_LIBSYSTEMD