Reverted commit 9a4b4a3d3b27fe4a7ff6d0b8724ce1c06b5917eb.

[nmh] / uip / fmtdump.c

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 463c7edfa5c8374693012b2bd1f12f09915ded1c..a3eec4059a11eb66ad458c6465dd9340be5da624 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -51,7 +51,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], *nfs, **argp, **arguments;
     struct format *fmt;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -110,7 +110,7 @@ static void
 fmt_dump (struct format *fmth)
 {
        int i;
-       register struct format *fmt, *addr;
+       struct format *fmt, *addr;
 
        /* Assign labels */
        for (fmt = fmth; fmt; ++fmt) {
@@ -142,7 +142,7 @@ fmt_dump (struct format *fmth)
 static void
 dumpone(struct format *fmt)
 {
-       register int i;
+       int i;
 
        if ((i = findlabel(fmt)) >= 0)
                printf("L%d:", i);
@@ -284,6 +284,7 @@ dumpone(struct format *fmt)
        case FT_LV_LIT:
        case FT_LV_PLUS_L:
        case FT_LV_MINUS_L:
+       case FT_LV_MULTIPLY_L:
        case FT_LV_DIVIDE_L:
        case FT_LV_MODULO_L:
                printf(" value %d", fmt->f_value);
@@ -321,7 +322,7 @@ dumpone(struct format *fmt)
 static int
 findlabel(struct format *addr)
 {
-       register int i;
+       int i;
 
        for (i = 0; i < lused; ++i)
                if (addr == lvec[i])
@@ -370,6 +371,7 @@ f_typestr(int t)
        case FT_LV_STRLEN: return("LV_STRLEN");
        case FT_LV_PLUS_L: return("LV_PLUS_L");
        case FT_LV_MINUS_L: return("LV_MINUS_L");
+       case FT_LV_MULTIPLY_L: return("LV_MULTIPLY_L");
        case FT_LV_DIVIDE_L: return("LV_DIVIDE_L");
        case FT_LV_MODULO_L: return("LV_MODULO_L");
        case FT_LV_CHAR_LEFT: return("LV_CHAR_LEFT");
@@ -452,7 +454,7 @@ f_typestr(int t)
 static char *
 c_typestr(int t)
 {
-       register int i;
+       int i;
        static char buf[64];
 
        buf[0] = '\0';
@@ -469,7 +471,7 @@ c_typestr(int t)
 static char *
 c_flagsstr(int t)
 {
-       register int i;
+       int i;
        static char buf[64];
 
        buf[0] = '\0';
@@ -490,10 +492,10 @@ static void
 litputs(char *s)
 {
        if (s) {
-               putc('"', stdout);
+               putchar('"');
                while (*s)
                        litputc(*s++);
-               putc('"', stdout);
+               putchar('"');
        } else
                fputs("<nil>", stdout);
 }
@@ -502,30 +504,30 @@ static void
 litputc(char c)
 {
        if (c & ~ 0177) {
-               putc('M', stdout);
-               putc('-', stdout);
+               putchar('M');
+               putchar('-');
                c &= 0177;
        }
        if (c < 0x20 || c == 0177) {
                if (c == '\b') {
-                       putc('\\', stdout);
-                       putc('b', stdout);
+                       putchar('\\');
+                       putchar('b');
                } else if (c == '\f') {
-                       putc('\\', stdout);
-                       putc('f', stdout);
+                       putchar('\\');
+                       putchar('f');
                } else if (c == '\n') {
-                       putc('\\', stdout);
-                       putc('n', stdout);
+                       putchar('\\');
+                       putchar('n');
                } else if (c == '\r') {
-                       putc('\\', stdout);
-                       putc('r', stdout);
+                       putchar('\\');
+                       putchar('r');
                } else if (c == '\t') {
-                       putc('\\', stdout);
-                       putc('t', stdout);
+                       putchar('\\');
+                       putchar('t');
                } else {
-                       putc('^', stdout);
-                       putc(c ^ 0x40, stdout); /* DEL to ?, others to alpha */
+                       putchar('^');
+                       putchar(c ^ 0x40);      /* DEL to ?, others to alpha */
                }
        } else
-               putc(c, stdout);
+               putchar(c);
 }