X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8f31323e9b1886f3fede30a3a618c9421f954e13..47dc478574290891a5bfd3131514c0ecc61ba39d:/uip/fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 8c850197..6d521196 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -434,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;
 	    }
@@ -451,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);
 	}
@@ -535,8 +531,7 @@ process_messages(struct format *fmt, struct msgs_array *comps,
 		ivector_push_back (seqnum, seq_getnum(mp, *ap));
 		
 	    num_unseen_seq = i;
-	    if (dp)
-	    	free(dp);
+            mh_xfree(dp);
 	}
     }
 
@@ -671,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]);
 	    }
 	}
@@ -706,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]);
 	}
 
@@ -741,14 +734,14 @@ 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=");
@@ -1143,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);
 }
@@ -1158,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);
 }
 
 /*