Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 33faf468b93df553d18f1ec63e3a3e54456c5154..eba84526f20644453fee95c986f17c36f66b39fe 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -1078,8 +1078,9 @@ fix_composite_cte (CT ct, int *message_mods) {
                 if (! strncasecmp (name, ENCODING_FIELD,
                                    strlen (ENCODING_FIELD))) {
                     char *prefix = "Nmh-REPLACED-INVALID-";
-                    HF h = mh_xmalloc (sizeof *h);
+                    HF h;
 
+                    NEW(h);
                     h->name = add (hf->name, NULL);
                     h->hf_encoding = hf->hf_encoding;
                     h->next = hf->next;
@@ -1276,7 +1277,7 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
                         HF hf;
 
                         parent->c_subtype = MULTI_ALTERNATE;
-                        parent->c_ctinfo.ci_subtype = getcpy ("alternative");
+                        parent->c_ctinfo.ci_subtype = mh_xstrdup("alternative");
                         if (! replace_substring (&parent->c_ctline, "/related",
                                                  "/alternative")) {
                             advise (NULL,
@@ -1395,8 +1396,9 @@ find_textplain_sibling (CT parent, int replacetextplain,
 static int
 insert_new_text_plain_part (CT ct, int new_subpart_number, CT parent) {
     struct multipart *mp = (struct multipart *) parent->c_ctparams;
-    struct part *new_part = mh_xmalloc (sizeof *new_part);
+    struct part *new_part;
 
+    NEW(new_part);
     if ((new_part->mp_part = build_text_plain_part (ct))) {
         char buffer[16];
         snprintf (buffer, sizeof buffer, "%d", new_subpart_number);
@@ -1758,8 +1760,8 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) {
     add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
               "boundary", boundary, 0);
 
-    p = (struct part *) mh_xmalloc (sizeof *p);
-    p->mp_next = (struct part *) mh_xmalloc (sizeof *p->mp_next);
+    NEW(p);
+    NEW(p->mp_next);
     p->mp_next->mp_next = NULL;
     p->mp_next->mp_part = first_alt;