mhshow/test-charset: Use octal, not hex, in printf(1) format string.

[nmh] / uip / fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 83e5c26d99c6b79e8b9152bcb9e2fef2c6439299..9a569ae41b8e06e6b8065ef5b00c07e2e6de07ae 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -11,7 +11,9 @@
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/addrsbr.h>
-#include "../sbr/m_maildir.h"
+#include "h/done.h"
+#include "sbr/m_maildir.h"
+#include "sbr/terminal.h"
 
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \
@@ -270,8 +272,7 @@ main (int argc, char **argv)
        if (mode == MESSAGE && !files && (*cp == '+' || *cp == '@')) {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
            app_msgarg(&msgs, cp);
     }
@@ -336,7 +337,7 @@ main (int argc, char **argv)
      */
 
     if (dupaddrs == 0 || trace) {
-       memset(&cb, 0, sizeof(cb));
+       ZERO(&cb);
        cbp = &cb;
 
        if (dupaddrs == 0) {
@@ -432,13 +433,13 @@ process_addresses(struct format *fmt, struct msgs_array *addrs,
        for (p = pq.pq_next; p; p = q) {
            c = fmt_findcomp("text");
            if (c) {
-                mh_xfree(c->c_text);
+                free(c->c_text);
                c->c_text = p->pq_text;
                p->pq_text = NULL;
            }
            c = fmt_findcomp("error");
            if (c) {
-                mh_xfree(c->c_text);
+                free(c->c_text);
                c->c_text = p->pq_error;
                p->pq_error = NULL;
            }
@@ -447,8 +448,8 @@ process_addresses(struct format *fmt, struct msgs_array *addrs,
            fputs(charstring_buffer(buffer), stdout);
            mlistfree();
 
-            mh_xfree(p->pq_text);
-            mh_xfree(p->pq_error);
+            free(p->pq_text);
+            free(p->pq_error);
            q = p->pq_next;
            free(p);
        }
@@ -529,7 +530,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
                ivector_push_back (seqnum, seq_getnum(mp, *ap));
                
            num_unseen_seq = i;
-            mh_xfree(dp);
+            free(dp);
        }
     }
 
@@ -664,7 +665,7 @@ finished:
        for (i = 0; i < comps->size; i += 2) {
            c = fmt_findcomp(comps->msgs[i]);
            if (c) {
-                mh_xfree(c->c_text);
+                free(c->c_text);
                c->c_text = getcpy(comps->msgs[i + 1]);
            }
        }
@@ -698,7 +699,7 @@ process_raw(struct format *fmt, struct msgs_array *text, charstring_t buffer,
 
     for (i = 0; i < text->size; i++) {
        if (c != NULL) {
-            mh_xfree(c->c_text);
+            free(c->c_text);
            c->c_text = getcpy(text->msgs[i]);
        }
 
@@ -982,8 +983,8 @@ findlabel(struct format *addr)
 
        for (i = 0; i < lused; ++i)
                if (addr == lvec[i])
-                       return(i);
-       return(-1);
+                       return i;
+       return -1;
 }
 
 static void
@@ -1101,7 +1102,7 @@ f_typestr(int t)
        case FT_V_AMATCH: return "V_AMATCH";
        default:
                snprintf(buf, sizeof(buf), "/* ??? #%d */", t);
-               return(buf);
+               return buf;
        }
 }
 
@@ -1111,7 +1112,7 @@ c_typestr(int t)
        static char buf[64];
 
        snprintb(buf, sizeof(buf), t, CT_BITS);
-       return(buf);
+       return buf;
 }
 
 static char *
@@ -1120,7 +1121,7 @@ c_flagsstr(int t)
        static char buf[64];
 
        snprintb(buf, sizeof(buf), t, CF_BITS);
-       return(buf);
+       return buf;
 }
 
 static void
@@ -1269,7 +1270,7 @@ test_formataddr (char *orig, char *str)
 
     *dst = '\0';
     last_dst = dst;
-    return (buf);
+    return buf;
 }