X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8a5a1a5303ddc67f06350a57a515853724a16e31..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index d5d47318..78f08561 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -11,7 +11,8 @@
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/addrsbr.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
+#include "sbr/terminal.h"
 
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \
@@ -431,13 +432,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;
 	    }
@@ -446,8 +447,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);
 	}
@@ -528,7 +529,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);
 	}
     }
 
@@ -663,7 +664,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]);
 	    }
 	}
@@ -697,7 +698,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]);
 	}