Relayouted all switch statements: case aligns with switch.

[mmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index 30ff189..82dfdcc 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -81,36 +81,39 @@ main(int argc, char **argv)
        while ((cp = *argp++)) {
                if (*cp == '-') {
                        switch (smatch(++cp, switches)) {
-                               case AMBIGSW:
-                                       ambigsw(cp, switches);
-                                       done(1);
-                               case UNKWNSW:
-                                       adios(NULL, "-%s unknown", cp);
-
-                               case HELPSW:
-                                       snprintf(buf, sizeof(buf), "%s [switches] [aliasfiles ...]", invo_name);
-                                       print_help(buf, switches, 0);
-                                       done(1);
-                               case VERSIONSW:
-                                       print_version(invo_name);
-                                       done(1);
-
-                               case MAILSW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       if (mail)
-                                               adios(NULL, "mail to one address only");
-                                       else
-                                               mail = cp;
-                                       continue;
-
-                               case SERCHSW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       if (dp >= NDIRS)
-                                               adios(NULL, "more than %d directories", NDIRS);
-                                       dirs[dp++] = cp;
-                                       continue;
+                       case AMBIGSW:
+                               ambigsw(cp, switches);
+                               done(1);
+                       case UNKWNSW:
+                               adios(NULL, "-%s unknown", cp);
+
+                       case HELPSW:
+                               snprintf(buf, sizeof(buf), "%s [switches] [aliasfiles ...]", invo_name);
+                               print_help(buf, switches, 0);
+                               done(1);
+                       case VERSIONSW:
+                               print_version(invo_name);
+                               done(1);
+
+                       case MAILSW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               if (mail)
+                                       adios(NULL, "mail to one address only");
+                               else
+                                       mail = cp;
+                               continue;
+
+                       case SERCHSW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               if (dp >= NDIRS)
+                                       adios(NULL, "more than %d directories",
+                                                       NDIRS);
+                               dirs[dp++] = cp;
+                               continue;
                        }
                }
                akv[akp++] = cp;
@@ -343,30 +346,30 @@ setup(void)
                        adios("pipe", "unable to");
 
                switch (fork()) {
-                       case NOTOK:
-                               adios("fork", "unable to");
-
-                       case OK:
-                               close(pd[1]);
-                               if (pd[0] != 0) {
-                                       dup2(pd[0], 0);
-                                       close(pd[0]);
-                               }
-                               if ((fd = open("/dev/null", O_WRONLY))
-                                               != NOTOK)
-                                       if (fd != 1) {
-                                               dup2(fd, 1);
-                                               close(fd);
-                                       }
-                               execlp(mailproc, mhbasename(mailproc),
-                                               mail, "-subject", invo_name,
-                                               NULL);
-                               adios(mailproc, "unable to exec ");
-
-                       default:
+               case NOTOK:
+                       adios("fork", "unable to");
+
+               case OK:
+                       close(pd[1]);
+                       if (pd[0] != 0) {
+                               dup2(pd[0], 0);
                                close(pd[0]);
-                               out = fdopen(pd[1], "w");
-                               fprintf(out, "%s: the following is suspicious\n\n", invo_name);
+                       }
+                       if ((fd = open("/dev/null", O_WRONLY))
+                                       != NOTOK)
+                               if (fd != 1) {
+                                       dup2(fd, 1);
+                                       close(fd);
+                               }
+                       execlp(mailproc, mhbasename(mailproc),
+                                       mail, "-subject", invo_name,
+                                       NULL);
+                       adios(mailproc, "unable to exec ");
+
+               default:
+                       close(pd[0]);
+                       out = fdopen(pd[1], "w");
+                       fprintf(out, "%s: the following is suspicious\n\n", invo_name);
                }
        }
 }