Reverted commit 9a4b4a3d3b27fe4a7ff6d0b8724ce1c06b5917eb.

[nmh] / uip / fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index a7742bd1a5a94f6b4a367107714af5ec94944a99..6d5211960d7d088f465fe1da76ac30732f2f30ba 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -351,10 +351,10 @@ main (int argc, char **argv)
        if (trace) {
            struct trace_context *ctx;
 
-           ctx = mh_xmalloc(sizeof(*ctx));
+           NEW(ctx);
            ctx->num = -1;
            ctx->str = dummy;
-           ctx->outbuf = getcpy(NULL);
+           ctx->outbuf = mh_xstrdup("");
 
            cb.trace_func = test_trace;
            cb.trace_context = ctx;
@@ -420,11 +420,10 @@ process_addresses(struct format *fmt, struct msgs_array *addrs,
     for (i = 0; i < addrs->size; i++) {
        (q = &pq)->pq_next = NULL;
        while ((cp = getname(addrs->msgs[i]))) {
-           if ((p = (struct pqpair *) mh_xcalloc ((size_t) 1, sizeof(*p))) == NULL)
-               adios (NULL, "unable to allocate pqpair memory");
+           NEW0(p);
            if ((mp = getm(cp, NULL, 0, error, sizeof(error))) == NULL) {
-               p->pq_text = getcpy(cp);
-               p->pq_error = getcpy(error);
+               p->pq_text = mh_xstrdup(cp);
+               p->pq_error = mh_xstrdup(error);
            } else {
                p->pq_text = getcpy(mp->m_text);
                mnfree(mp);
@@ -435,15 +434,13 @@ process_addresses(struct format *fmt, struct msgs_array *addrs,
        for (p = pq.pq_next; p; p = q) {
            c = fmt_findcomp("text");
            if (c) {
-               if (c->c_text)
-                   free(c->c_text);
+                mh_xfree(c->c_text);
                c->c_text = p->pq_text;
                p->pq_text = NULL;
            }
            c = fmt_findcomp("error");
            if (c) {
-               if (c->c_text)
-                   free(c->c_text);
+                mh_xfree(c->c_text);
                c->c_text = p->pq_error;
                p->pq_error = NULL;
            }
@@ -452,10 +449,8 @@ process_addresses(struct format *fmt, struct msgs_array *addrs,
            fputs(charstring_buffer(buffer), stdout);
            mlistfree();
 
-           if (p->pq_text)
-               free(p->pq_text);
-           if (p->pq_error)
-               free(p->pq_error);
+            mh_xfree(p->pq_text);
+            mh_xfree(p->pq_error);
            q = p->pq_next;
            free(p);
        }
@@ -530,14 +525,13 @@ process_messages(struct format *fmt, struct msgs_array *comps,
        if ((cp = context_find(usequence)) && *cp) {
            char **ap, *dp;
 
-           dp = getcpy(cp);
+           dp = mh_xstrdup(cp);
            ap = brkstring(dp, " ", "\n");
            for (i = 0; ap && *ap; i++, ap++)
                ivector_push_back (seqnum, seq_getnum(mp, *ap));
                
            num_unseen_seq = i;
-           if (dp)
-               free(dp);
+            mh_xfree(dp);
        }
     }
 
@@ -672,8 +666,7 @@ finished:
        for (i = 0; i < comps->size; i += 2) {
            c = fmt_findcomp(comps->msgs[i]);
            if (c) {
-               if (c->c_text)
-                   free(c->c_text);
+                mh_xfree(c->c_text);
                c->c_text = getcpy(comps->msgs[i + 1]);
            }
        }
@@ -707,8 +700,7 @@ process_raw(struct format *fmt, struct msgs_array *text, charstring_t buffer,
 
     for (i = 0; i < text->size; i++) {
        if (c != NULL) {
-           if (c->c_text != NULL)
-               free(c->c_text);
+            mh_xfree(c->c_text);
            c->c_text = getcpy(text->msgs[i]);
        }
 
@@ -742,21 +734,21 @@ test_trace(void *context, struct format *fmt, int num, char *str,
 
     if (str != ctx->str) {
        if (changed++)
-           printf(" ");
+            putchar(' ');
        printf("str=");
        litputs(str);
        ctx->str = str;
     }
 
     if (changed)
-       printf("\n");
+        putchar('\n');
 
     if (strcmp(outbuf, ctx->outbuf) != 0) {
        printf("outbuf=");
        litputs(outbuf);
        putchar('\n');
        free(ctx->outbuf);
-       ctx->outbuf = getcpy(outbuf);
+       ctx->outbuf = mh_xstrdup(outbuf);
     }
 }
 
@@ -778,7 +770,7 @@ fmt_dump (char *nfs, struct format *fmth)
 static void
 dumpone(struct format *fmt)
 {
-       register int i;
+       int i;
 
        if ((i = findlabel(fmt)) >= 0)
                printf("L%d:", i);
@@ -920,6 +912,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);
@@ -989,7 +982,7 @@ initlabels(struct format *fmth)
 static int
 findlabel(struct format *addr)
 {
-       register int i;
+       int i;
 
        for (i = 0; i < lused; ++i)
                if (addr == lvec[i])
@@ -1044,6 +1037,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");
@@ -1142,10 +1136,10 @@ static void
 litputs(const char *s)
 {
        if (s) {
-               putc('"', stdout);
+               putchar('"');
                while (*s)
                        litputc(*s++);
-               putc('"', stdout);
+               putchar('"');
        } else
                fputs("<nil>", stdout);
 }
@@ -1157,26 +1151,26 @@ litputc(char c)
                printf("\\x%02x", (unsigned char) c);
        } else 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);
 }
 
 /*
@@ -1222,13 +1216,13 @@ static unsigned int bufsiz=0;   /* current size of buf */
 static char *
 test_formataddr (char *orig, char *str)
 {
-    register int len;
+    int len;
     char error[BUFSIZ];
-    register int isgroup;
-    register char *dst;
-    register char *cp;
-    register char *sp;
-    register struct mailname *mp = NULL;
+    int isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;
 
     /* if we don't have a buffer yet, get one */
     if (bufsiz == 0) {