X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/275cd091960ac836c4ccb3b7e07ceeda6df7ddd7..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/fmttest.c?ds=inline

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 712d7df2..7d08438b 100644
--- 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);
@@ -990,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])
@@ -1224,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) {