Fix style of switch cases indentation

[khatus.git] / x5 / khatus.c

diff --git a/x5/khatus.c b/x5/khatus.c
index b21336d..6ecb1e7 100644 (file)
--- a/x5/khatus.c
+++ b/x5/khatus.c
@@ -178,14 +178,20 @@ void
 parse_opts_opt(Config *cfg, int argc, char *argv[], int i)
 {
        switch (argv[i][1]) {
-               case 'i': parse_opts_opt_i(cfg, argc, argv, ++i); break;  /* TODO: Generic set_int */
-               case 's': parse_opts_opt_s(cfg, argc, argv, ++i); break;  /* TODO: Generic set_str */
-               case 'x': {
+               case 'i':
+                       /* TODO: Generic set_int */
+                       parse_opts_opt_i(cfg, argc, argv, ++i);
+                       break;
+               case 's':
+                       /* TODO: Generic set_str */
+                       parse_opts_opt_s(cfg, argc, argv, ++i);
+                       break;
+               case 'x':
                        cfg->output_to_x_root_window = 1;
                        opts_parse_any(cfg, argc, argv, ++i);
                        break;
-               }
-               default : usage("Option \"%s\" is invalid\n", argv[i]);
+               default :
+                       usage("Option \"%s\" is invalid\n", argv[i]);
        }
 }
 
@@ -227,8 +233,11 @@ opts_parse_any(Config *cfg, int argc, char *argv[], int i)
 {
        if (i < argc) {
                switch (argv[i][0]) {
-                       case '-': parse_opts_opt(cfg, argc, argv, i); break;
-                       default : parse_opts_spec(cfg, argc, argv, i);
+                       case '-':
+                               parse_opts_opt(cfg, argc, argv, i);
+                               break;
+                       default :
+                               parse_opts_spec(cfg, argc, argv, i);
                }
        }
 }
@@ -249,7 +258,7 @@ opts_parse(Config *cfg, int argc, char *argv[])
 }
 
 void
-read_error(Fifo *f, char *buf)
+fifo_read_error(Fifo *f, char *buf)
 {
        char *b;
        int i;
@@ -265,7 +274,7 @@ read_error(Fifo *f, char *buf)
 }
 
 void
-read_one(Fifo *f, char *buf)
+fifo_read_one(Fifo *f, char *buf)
 {
        ssize_t current;
        ssize_t total;
@@ -276,21 +285,21 @@ read_one(Fifo *f, char *buf)
        total = 0;
        c = '\0';
        b = buf + f->pos;
-       /* TODO: Could optimize here and only blank-out the remaining slots. */
-       memset(b, ' ', f->width);
        while ((current = read(f->fd, &c, 1)) && c != '\n' && c != '\0' && total++ < f->width)
                *b++ = c;
        if (current == -1) {
                error("Failed to read: \"%s\". Error: %s\n", f->name, strerror(errno));
-               read_error(f, buf);
-       }
+               fifo_read_error(f, buf);
+       } else
+               while (total++ < f->width)
+                       *b++ = ' ';
        /* TODO Record timestamp read */
        close(f->fd);
        f->fd = -1;
 }
 
 void
-read_all(Config *cfg, char *buf)
+fifo_read_all(Config *cfg, char *buf)
 {
        fd_set fds;
        int maxfd = -1;
@@ -303,12 +312,12 @@ read_all(Config *cfg, char *buf)
                /* TODO: Create the FIFO if it doesn't already exist. */
                if (lstat(f->name, &st) < 0) {
                        error("Cannot stat \"%s\". Error: %s\n", f->name, strerror(errno));
-                       read_error(f, buf);
+                       fifo_read_error(f, buf);
                        continue;
                }
                if (!(st.st_mode & S_IFIFO)) {
                        error("\"%s\" is not a FIFO\n", f->name);
-                       read_error(f, buf);
+                       fifo_read_error(f, buf);
                        continue;
                }
                debug("opening: %s\n", f->name);
@@ -317,7 +326,7 @@ read_all(Config *cfg, char *buf)
                if (f->fd == -1) {
                        /* TODO: Consider backing off retries for failed fifos. */
                        error("Failed to open \"%s\"\n", f->name);
-                       read_error(f, buf);
+                       fifo_read_error(f, buf);
                        continue;
                }
                if (f->fd > maxfd)
@@ -333,7 +342,7 @@ read_all(Config *cfg, char *buf)
        for (Fifo *f = cfg->fifos; f; f = f->next) {
                if (FD_ISSET(f->fd, &fds)) {
                        debug("reading: %s\n", f->name);
-                       read_one(f, buf);
+                       fifo_read_one(f, buf);
                }
        }
 }
@@ -406,10 +415,10 @@ main(int argc, char *argv[])
        for (;;) {
                /* TODO: Check TTL and maybe blank-out */
                /* TODO: How to trigger TTL check? On select? Alarm signal? */
-               /* TODO: Set timeout on read_all based on diff of last time of
-                *       read_all and desired time of next TTL check.
+               /* TODO: Set timeout on fifo_read_all based on diff of last time of
+                *       fifo_read_all and desired time of next TTL check.
                 * */
-               read_all(cfg, buf);
+               fifo_read_all(cfg, buf);
                if (cfg->output_to_x_root_window) {
                        if (XStoreName(display, DefaultRootWindow(display), buf) < 0)
                                fatal("XStoreName failed.\n");