Relayouted all switch statements: case aligns with switch.
[mmh] / uip / scansbr.c
index 8a07418..6eca931 100644 (file)
@@ -192,119 +192,114 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
        for (compnum = 1; ;
                        state = m_getfld(state, name, tmpbuf, rlwidth, inb)) {
                switch (state) {
-                       case FLD:
-                       case FLDPLUS:
-                               compnum++;
-                               if (outnum) {
-                                       FPUTS(name);
-                                       if (putc(':', scnout) == EOF)
-                                               DIEWRERR();
-                                       FPUTS(tmpbuf);
-                               }
-                               /*
-                               ** if we're interested in this component,
-                               ** save a pointer to the component text,
-                               ** then start using our next free buffer
-                               ** as the component temp buffer (buffer
-                               ** switching saves an extra copy of the
-                               ** component text).
-                               */
-                               if ((cptr = wantcomp[CHASH(name)])) {
-                                       do {
-                                               if (!mh_strcasecmp(name, cptr->c_name)) {
-                                                       if (! cptr->c_text) {
-                                                               cptr->c_text = tmpbuf;
-                                                               for (cp = tmpbuf + strlen(tmpbuf) - 1;
-                                                                               cp >= tmpbuf; cp--)
-                                                                       if (isspace(*cp))
-                                                                               *cp = 0;
-                                                                       else
-                                                                               break;
-                                                               *--savecomp = cptr;
-                                                               tmpbuf = *nxtbuf++;
-                                                       }
-                                                       break;
+               case FLD:
+               case FLDPLUS:
+                       compnum++;
+                       if (outnum) {
+                               FPUTS(name);
+                               if (putc(':', scnout) == EOF)
+                                       DIEWRERR();
+                               FPUTS(tmpbuf);
+                       }
+                       /*
+                       ** if we're interested in this component, save
+                       ** a pointer to the component text, then start
+                       ** using our next free buffer as the component
+                       ** temp buffer (buffer switching saves an extra
+                       ** copy of the component text).
+                       */
+                       if ((cptr = wantcomp[CHASH(name)])) {
+                               do {
+                                       if (!mh_strcasecmp(name, cptr->c_name)) {
+                                               if (! cptr->c_text) {
+                                                       cptr->c_text = tmpbuf;
+                                                       for (cp = tmpbuf + strlen(tmpbuf) - 1; cp >= tmpbuf; cp--)
+                                                               if (isspace(*cp))
+                                                                       *cp = 0;
+                                                               else
+                                                                       break;
+                                                       *--savecomp = cptr;
+                                                       tmpbuf = *nxtbuf++;
                                                }
-                                       } while ((cptr = cptr->c_next));
-                               }
+                                               break;
+                                       }
+                               } while ((cptr = cptr->c_next));
+                       }
 
-                               while (state == FLDPLUS) {
-                                       state = m_getfld(state, name, tmpbuf,
-                                                       rlwidth, inb);
-                                       if (outnum)
-                                               FPUTS(tmpbuf);
-                               }
-                               break;
+                       while (state == FLDPLUS) {
+                               state = m_getfld(state, name, tmpbuf, rlwidth,
+                                               inb);
+                               if (outnum)
+                                       FPUTS(tmpbuf);
+                       }
+                       break;
 
-                       case BODY:
-                               compnum = -1;
-                               if (! outnum) {
-                                       state = FILEEOF; /* stop now if scan cmd */
-                                       goto finished;
-                               }
-                               if (putc('\n', scnout) == EOF) DIEWRERR();
-                               FPUTS(tmpbuf);
-                               /*
-                               ** performance hack: some people like to
-                               ** run "inc" on things like net.sources or
-                               ** large digests.  We do a copy directly
-                               ** into the output buffer rather than
-                               ** going through an intermediate buffer.
-                               **
-                               ** We need the amount of data m_getfld
-                               ** found & don't want to do a strlen on
-                               ** the long buffer so there's a hack in
-                               ** m_getfld to save the amount of data it
-                               ** returned in the global "msg_count".
-                               */
+               case BODY:
+                       compnum = -1;
+                       if (! outnum) {
+                               state = FILEEOF; /* stop now if scan cmd */
+                               goto finished;
+                       }
+                       if (putc('\n', scnout) == EOF) DIEWRERR();
+                       FPUTS(tmpbuf);
+                       /*
+                       ** performance hack: some people like to run "inc"
+                       ** on things like net.sources or large digests.
+                       ** We do a copy directly into the output buffer
+                       ** rather than going through an intermediate buffer.
+                       **
+                       ** We need the amount of data m_getfld found &
+                       ** don't want to do a strlen on the long buffer so
+                       ** there's a hack in m_getfld to save the amount
+                       ** of data it returned in the global "msg_count".
+                       */
 body:;
-                               while (state == BODY) {
+                       while (state == BODY) {
 #ifdef LINUX_STDIO
-                                       if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
+                               if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
 #elif defined(__DragonFly__)
-                                       if (((struct __FILE_public *)scnout)->_w <= 0) {
+                               if (((struct __FILE_public *)scnout)->_w <= 0) {
 #else
-                                       if (scnout->_cnt <= 0) {
+                               if (scnout->_cnt <= 0) {
 #endif
-                                               if (fflush(scnout) == EOF)
-                                                       DIEWRERR();
-                                       }
+                                       if (fflush(scnout) == EOF)
+                                               DIEWRERR();
+                               }
 #ifdef LINUX_STDIO
-                                       state = m_getfld(state, name, scnout->_IO_write_ptr,
-                                               (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , inb);
-                                       scnout->_IO_write_ptr += msg_count;
+                               state = m_getfld(state, name, scnout->_IO_write_ptr, (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , inb);
+                               scnout->_IO_write_ptr += msg_count;
 #elif defined(__DragonFly__)
-                                       state = m_getfld(state, name, ((struct __FILE_public *)scnout)->_p, -(((struct __FILE_public *)scnout)->_w), inb );
-                                       ((struct __FILE_public *)scnout)->_w -= msg_count;
-                                       ((struct __FILE_public *)scnout)->_p += msg_count;
+                               state = m_getfld(state, name, ((struct __FILE_public *)scnout)->_p, -(((struct __FILE_public *)scnout)->_w), inb);
+                               ((struct __FILE_public *)scnout)->_w -= msg_count;
+                               ((struct __FILE_public *)scnout)->_p += msg_count;
 #else
-                                       state = m_getfld( state, name, scnout->_ptr, -(scnout->_cnt), inb );
-                                       scnout->_cnt -= msg_count;
-                                       scnout->_ptr += msg_count;
+                               state = m_getfld( state, name, scnout->_ptr, -(scnout->_cnt), inb);
+                               scnout->_cnt -= msg_count;
+                               scnout->_ptr += msg_count;
 #endif
-                               }
-                               goto finished;
-
-                       case LENERR:
-                       case FMTERR:
-                               fprintf(stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum);
-                               fprintf(stderr, "component %d\n", compnum);
-
-                               if (outnum) {
-                                       FPUTS("\n\nBAD MSG:\n");
-                                       FPUTS(name);
-                                       if (putc('\n', scnout) == EOF)
-                                               DIEWRERR();
-                                       state = BODY;
-                                       goto body;
-                               }
-                               /* fall through */
+                       }
+                       goto finished;
+
+               case LENERR:
+               case FMTERR:
+                       fprintf(stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum);
+                       fprintf(stderr, "component %d\n", compnum);
+
+                       if (outnum) {
+                               FPUTS("\n\nBAD MSG:\n");
+                               FPUTS(name);
+                               if (putc('\n', scnout) == EOF)
+                                       DIEWRERR();
+                               state = BODY;
+                               goto body;
+                       }
+                       /* fall through */
 
-                       case FILEEOF:
-                               goto finished;
+               case FILEEOF:
+                       goto finished;
 
-                       default:
-                               adios(NULL, "getfld() returned %d", state);
+               default:
+                       adios(NULL, "getfld() returned %d", state);
                }
        }