X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0ade9a7dda420f7e50a83977f75f90ab7b488279..4d6435dbde12837bdf4b4d594e0440392df4b9d3:/uip/mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 093c9776..42484a87 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -206,9 +206,9 @@ DisplayMsgHeader (CT ct, char *form, int concatsw)
     char *file;
 
     vec = argsplit(mhlproc, &file, &vecp);
-    vec[vecp++] = getcpy("-form");
+    vec[vecp++] = mh_xstrdup("-form");
     vec[vecp++] = getcpy(form);
-    vec[vecp++] = getcpy("-nobody");
+    vec[vecp++] = mh_xstrdup("-nobody");
     vec[vecp++] = getcpy(ct->c_file);
 
     /*
@@ -216,9 +216,9 @@ DisplayMsgHeader (CT ct, char *form, int concatsw)
      * then just pass that along.
      */
     if (nomore || concatsw) {
-	vec[vecp++] = getcpy("-nomoreproc");
+	vec[vecp++] = mh_xstrdup("-nomoreproc");
     } else if (progsw) {
-	vec[vecp++] = getcpy("-moreproc");
+	vec[vecp++] = mh_xstrdup("-moreproc");
 	vec[vecp++] = getcpy(progsw);
     }
     vec[vecp] = NULL;
@@ -1359,14 +1359,14 @@ compile_marker(char *form)
 	    dispo_comp = comp;
 	} else if (strncasecmp(comp->c_name, "ctype-", 6) == 0 &&
 		   strlen(comp->c_name) > 6) {
-	    pc_entry = mh_xmalloc(sizeof(*pc_entry));
+	    NEW(pc_entry);
 	    pc_entry->param = getcpy(comp->c_name + 6);
 	    pc_entry->comp = comp;
 	    pc_entry->next = ctype_pc_list;
 	    ctype_pc_list = pc_entry;
 	} else if (strncasecmp(comp->c_name, "cdispo-", 7) == 0 &&
 		   strlen(comp->c_name) > 7) {
-	    pc_entry = mh_xmalloc(sizeof(*pc_entry));
+	    NEW(pc_entry);
 	    pc_entry->param = getcpy(comp->c_name + 7);
 	    pc_entry->comp = comp;
 	    pc_entry->next = dispo_pc_list;