Replace `(char *)0' et al with `NULL'.

[nmh] / uip / mhfixmsg.c

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 33faf468b93df553d18f1ec63e3a3e54456c5154..cd38983cdff50d6bd8beb61c818942dcdd169d7e 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -924,10 +924,10 @@ fix_types (CT ct, svector_t fixtypes, int *message_mods) {
                            * c_ctline
                            */
                         /* Extract type and subtype from type/subtype. */
-                        ct_type = getcpy (ct_type_subtype);
+                        ct_type = mh_xstrdup(ct_type_subtype);
                         if ((cp = strchr (ct_type, '/'))) {
                             *cp = '\0';
-                            ct_subtype = getcpy (++cp);
+                            ct_subtype = mh_xstrdup(++cp);
                         } else {
                             advise (NULL, "missing / in MIME type of %s %s",
                                     ct->c_file, ct->c_partno);
@@ -991,7 +991,7 @@ replace_substring (char **str, const char *old, const char *new) {
         char *prefix, *new_str;
 
         if (cp - *str) {
-            prefix = getcpy (*str);
+            prefix = mh_xstrdup(*str);
             *(prefix + (cp - *str)) = '\0';
             new_str = concat (prefix, new, remainder, NULL);
             free (prefix);
@@ -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);
@@ -1538,10 +1540,10 @@ copy_ctinfo (CI dest, CI src) {
        d_pm = add_param(&dest->ci_first_pm, &dest->ci_last_pm, s_pm->pm_name,
                         s_pm->pm_value, 0);
        if (s_pm->pm_charset) {
-           d_pm->pm_charset = getcpy(s_pm->pm_charset);
+           d_pm->pm_charset = mh_xstrdup(s_pm->pm_charset);
         }
        if (s_pm->pm_lang) {
-           d_pm->pm_lang = getcpy(s_pm->pm_lang);
+           d_pm->pm_lang = mh_xstrdup(s_pm->pm_lang);
         }
     }
 
@@ -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;