Fix style of switch cases indentation

[khatus.git] / x5 / khatus.c

diff --git a/x5/khatus.c b/x5/khatus.c
index 2a026dc..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);
                }
        }
 }
@@ -276,14 +285,14 @@ fifo_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));
                fifo_read_error(f, buf);
-       }
+       } else
+               while (total++ < f->width)
+                       *b++ = ' ';
        /* TODO Record timestamp read */
        close(f->fd);
        f->fd = -1;