inc.c: Narrow scope of inc_type. Chain mutually-exclusive ifs.

[nmh] / uip / fmtdump.c

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index a3eec4059a11eb66ad458c6465dd9340be5da624..57968f0eb4ba3e61cf862bc3a3525bbbf942afb0 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -1,6 +1,4 @@
-
-/*
- * fmtdump.c -- compile format file and dump out instructions
+/* fmtdump.c -- compile format file and dump out instructions
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,6 +9,7 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/scansbr.h>
+#include <h/utils.h>
 
 #define FMTDUMP_SWITCHES \
     X("form formatfile", 0, FORMSW) \
@@ -266,6 +265,7 @@ dumpone(struct format *fmt)
        case FT_IF_MATCH:
        case FT_IF_AMATCH:
                printf(" continue else goto");
+               /* FALLTHRU */
        case FT_GOTO:
                i = findlabel(fmt + fmt->f_skip);
                printf(" L%d", i);
@@ -409,6 +409,7 @@ f_typestr(int t)
        case FT_LS_FRIENDLY: return("LS_FRIENDLY");
        case FT_LV_HOSTTYPE: return("LV_HOSTTYPE");
        case FT_LV_INGRPF: return("LV_INGRPF");
+       case FT_LS_UNQUOTE: return("LS_UNQUOTE");
        case FT_LV_NOHOSTF: return("LV_NOHOSTF");
        case FT_LOCALDATE: return("LOCALDATE");
        case FT_GMTDATE: return("GMTDATE");
@@ -420,9 +421,7 @@ f_typestr(int t)
        case FT_GETMYMBOX: return("GETMYMBOX");
        case FT_GETMYADDR: return("GETMYADDR");
        case FT_SAVESTR: return("SAVESTR");
-#ifdef FT_PAUSE
        case FT_PAUSE: return ("PAUSE");
-#endif
        case FT_DONE: return("DONE");
        case FT_NOP: return("NOP");
        case FT_GOTO: return("GOTO");
@@ -441,7 +440,7 @@ f_typestr(int t)
        case FT_V_MATCH: return("V_MATCH");
        case FT_V_AMATCH: return("V_AMATCH");
        default:
-               printf(buf, "/* ??? #%d */", t);
+                snprintf(buf, sizeof buf, "/* ??? #%d */", t);
                return(buf);
        }
 }
@@ -459,7 +458,7 @@ c_typestr(int t)
 
        buf[0] = '\0';
        if (t & ~(CT_ADDR|CT_DATE))
-               printf(buf, "0x%x ", t);
+                snprintf(buf, sizeof buf, "0x%x ", t);
        strcat(buf, "<");
        i = 0;
        FNORD(CT_ADDR, "ADDR");
@@ -476,7 +475,7 @@ c_flagsstr(int t)
 
        buf[0] = '\0';
        if (t & ~(CF_TRUE|CF_PARSED|CF_DATEFAB|CF_TRIMMED))
-               printf(buf, "0x%x ", t);
+                snprintf(buf, sizeof buf, "0x%x ", t);
        strcat(buf, "<");
        i = 0;
        FNORD(CF_TRUE, "TRUE");