From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Mon, 11 Sep 2017 17:56:50 +0000 (+0100)
Subject: Delete mh_xfree(), changing callers to call free(3) instead.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/92c3b05ef3e582d64b3cecfc261fdd66ef13a4ef?ds=inline;hp=31da9febde0d822d73f99089109bacc1c3e36433

Delete mh_xfree(), changing callers to call free(3) instead.

A free(3) that didn't handle NULL is now long past.
---

diff --git a/h/utils.h b/h/utils.h
index 13ac94e9..7cb96efd 100644
--- a/h/utils.h
+++ b/h/utils.h
@@ -22,9 +22,6 @@ void *mh_xcalloc(size_t nelem, size_t elsize) MALLOC ALLOC_SIZE(1, 2);
 /* Duplicate a NUL-terminated string, exit on failure. */
 char *mh_xstrdup(const char *src) MALLOC;
 
-/* Call free(3), if ptr isn't NULL. */
-void mh_xfree(void *ptr);
-
 /* Set p to point to newly allocated, uninitialised, memory. */
 #define NEW(p) ((p) = mh_xmalloc(sizeof *(p)))
 
diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 6f0dcac4..b4e6e890 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -204,13 +204,13 @@ mnfree (struct mailname *mp)
     if (!mp)
 	return;
 
-    mh_xfree(mp->m_text);
-    mh_xfree(mp->m_pers);
-    mh_xfree(mp->m_mbox);
-    mh_xfree(mp->m_host);
-    mh_xfree(mp->m_path);
-    mh_xfree(mp->m_gname);
-    mh_xfree(mp->m_note);
+    free(mp->m_text);
+    free(mp->m_pers);
+    free(mp->m_mbox);
+    free(mp->m_host);
+    free(mp->m_path);
+    free(mp->m_gname);
+    free(mp->m_note);
 
     free(mp);
 }
diff --git a/sbr/arglist.c b/sbr/arglist.c
index ceac3f1a..59d311b2 100644
--- a/sbr/arglist.c
+++ b/sbr/arglist.c
@@ -131,7 +131,7 @@ arglist_free(char *command, char **argvarray)
 {
     int i;
 
-    mh_xfree(command);
+    free(command);
 
     if (argvarray != NULL) {
     	for (i = 0; argvarray[i] != NULL; i++)
diff --git a/sbr/context_del.c b/sbr/context_del.c
index efe5e410..59e3be70 100644
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -27,7 +27,7 @@ context_del (char *key)
 	    else
 		m_defs = np->n_next;
 	    free (np->n_name);
-            mh_xfree(np->n_field);
+            free(np->n_field);
 	    free(np);
 	    ctxflags |= CTXMOD;
 	    return 0;
diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 1027dcf6..0fdd7b4e 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -37,7 +37,7 @@ context_replace (char *key, char *value)
 	    if (strcmp (value, np->n_field)) {
 		if (!np->n_context)
 		    inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);
-                mh_xfree(np->n_field);
+                free(np->n_field);
 		np->n_field = mh_xstrdup(value);
 		ctxflags |= CTXMOD;
 	    }
diff --git a/sbr/credentials.c b/sbr/credentials.c
index d3e8075f..b610b2b9 100644
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -128,8 +128,8 @@ nmh_cred_get_password(nmh_creds_t creds)
 void
 nmh_credentials_free(nmh_creds_t creds)
 {
-    mh_xfree(creds->host);
-    mh_xfree(creds->user);
+    free(creds->host);
+    free(creds->user);
 
     if (creds->pass) {
 	memset(creds->pass, 0, strlen(creds->pass));
diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index c86cea7f..0ded2e93 100644
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -799,8 +799,8 @@ do_reformat:
     output = NULL;
 
 out:
-    mh_xfree(tmpbuf);
-    mh_xfree(output);
+    free(tmpbuf);
+    free(output);
 
     return errflag > 0;
 }
diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index ff0cf013..aa555c62 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -969,7 +969,7 @@ fmt_freecomptext(void)
 
     for (i = 0; i < DIM(wantcomp); i++)
         for (cm = wantcomp[i]; cm; cm = cm->c_next) {
-            mh_xfree(cm->c_text);
+            free(cm->c_text);
             cm->c_text = NULL;
         }
 }
@@ -1143,8 +1143,8 @@ free_component(struct comp *cm)
 {
     if (--cm->c_refcount <= 0) {
     	/* Shouldn't ever be NULL, but just in case ... */
-        mh_xfree(cm->c_name);
-        mh_xfree(cm->c_text);
+        free(cm->c_name);
+        free(cm->c_text);
 	if (cm->c_type & CT_DATE)
 	    free(cm->c_tws);
 	if (cm->c_type & CT_ADDR && cm->c_mn && cm->c_mn != &fmt_mnull)
diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c
index c699dbd9..cd81017a 100644
--- a/sbr/fmt_new.c
+++ b/sbr/fmt_new.c
@@ -28,7 +28,7 @@ new_fs (char *form, char *format, char *default_fs)
     struct stat st;
     FILE *fp;
 
-    mh_xfree(formats);
+    free(formats);
 
     if (form) {
 	if ((fp = fopen (etcpath (form), "r")) == NULL)
diff --git a/sbr/folder_free.c b/sbr/folder_free.c
index cf85af18..7c6267f6 100644
--- a/sbr/folder_free.c
+++ b/sbr/folder_free.c
@@ -19,7 +19,7 @@ folder_free (struct msgs *mp)
     if (!mp)
 	return;
 
-    mh_xfree(mp->foldpath);
+    free(mp->foldpath);
 
     /* free the sequence names */
     for (i = 0; i < svector_size (mp->msgattrs); i++)
@@ -36,7 +36,7 @@ folder_free (struct msgs *mp)
     if (mp->seqhandle)
     	lkfclosedata (mp->seqhandle, mp->seqname);
 
-    mh_xfree(mp->seqname);
+    free(mp->seqname);
 
     bvector_free (mp->attrstats);
     free (mp);			/* free main folder structure */
diff --git a/sbr/mf.c b/sbr/mf.c
index 86104de2..1ff8416f 100644
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -152,12 +152,12 @@ getadrx (const char *addrs, int eai)
     char *bp;
     struct adrx *adrxp = &adrxs2;
 
-    mh_xfree(pers);
-    mh_xfree(mbox);
-    mh_xfree(host);
-    mh_xfree(routepath);
-    mh_xfree(grp);
-    mh_xfree(note);
+    free(pers);
+    free(mbox);
+    free(host);
+    free(routepath);
+    free(grp);
+    free(note);
     pers = mbox = host = routepath = grp = note = NULL;
     err[0] = 0;
 
@@ -237,7 +237,7 @@ again: ;
 	    }
 	    /* FALLTHRU */
 	case LX_COMA: 
-            mh_xfree(note);
+            free(note);
             note = NULL;
 	    goto again;
 
diff --git a/sbr/netsec.c b/sbr/netsec.c
index bdf39a30..25b1f888 100644
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -188,19 +188,19 @@ netsec_init(void)
 void
 netsec_shutdown(netsec_context *nsc)
 {
-    mh_xfree(nsc->ns_userid);
-    mh_xfree(nsc->ns_hostname);
-    mh_xfree(nsc->ns_inbuffer);
-    mh_xfree(nsc->ns_outbuffer);
-    mh_xfree(nsc->sasl_mech);
-    mh_xfree(nsc->sasl_chosen_mech);
+    free(nsc->ns_userid);
+    free(nsc->ns_hostname);
+    free(nsc->ns_inbuffer);
+    free(nsc->ns_outbuffer);
+    free(nsc->sasl_mech);
+    free(nsc->sasl_chosen_mech);
 #ifdef OAUTH_SERVICE
-    mh_xfree(nsc->oauth_service);
+    free(nsc->oauth_service);
 #endif /* OAUTH_SERVICE */
 #ifdef CYRUS_SASL
     if (nsc->sasl_conn)
 	sasl_dispose(&nsc->sasl_conn);
-    mh_xfree(nsc->sasl_cbs);
+    free(nsc->sasl_cbs);
     if (nsc->sasl_creds)
 	nmh_credentials_free(nsc->sasl_creds);
     if (nsc->sasl_secret) {
@@ -209,7 +209,7 @@ netsec_shutdown(netsec_context *nsc)
 	}
 	free(nsc->sasl_secret);
     }
-    mh_xfree(nsc->sasl_tmpbuf);
+    free(nsc->sasl_tmpbuf);
 #endif /* CYRUS_SASL */
 #ifdef TLS_SUPPORT
     if (nsc->ssl_io)
@@ -1282,7 +1282,7 @@ netsec_negotiate_sasl(netsec_context *nsc, const char *mechlist, char **errstr)
 	rc = sasl_client_step(nsc->sasl_conn, (char *) outbuf, outbuflen, NULL,
 			      (const char **) &saslbuf, &saslbuflen);
 
-        mh_xfree(outbuf);
+        free(outbuf);
 
 	if (rc != SASL_OK && rc != SASL_CONTINUE) {
 	    netsec_err(errstr, "SASL client negotiation failed: %s",
diff --git a/sbr/utils.c b/sbr/utils.c
index 3be04e7e..8debe1aa 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -48,7 +48,7 @@ void *mh_xrealloc(void *ptr, size_t size)
 
     /* Copy POSIX behaviour, coping with non-POSIX systems. */
     if (size == 0) {
-        mh_xfree(ptr);
+        free(ptr);
         return mh_xmalloc(1); /* Get a unique pointer. */
     }
     if (!ptr)
@@ -89,13 +89,6 @@ char *mh_xstrdup(const char *src)
     return dest;
 }
 
-/* Call free(3), if ptr isn't NULL. */
-void mh_xfree(void *ptr)
-{
-    if (ptr)
-        free(ptr); /* Some very old platforms can't cope with NULL. */
-}
-
 /*
  * Return the present working directory, if the current directory does not
  * exist, or is too long, make / the pwd.
diff --git a/uip/ali.c b/uip/ali.c
index 1c75644b..43e9f5a7 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -119,7 +119,7 @@ main (int argc, char **argv)
 	    for (ap = brkstring(dp = mh_xstrdup(cp), " ", "\n"); ap && *ap; ap++)
 		if ((i = alias (*ap)) != AK_OK)
 		    adios (NULL, "aliasing error in %s - %s", *ap, akerror (i));
-            mh_xfree(dp);
+            free(dp);
 	}
 	alias (AliasFile);
     }
@@ -236,5 +236,5 @@ print_usr (char *s, bool list)
 
     print_aka (vp ? vp : s, list, 0);
 
-    mh_xfree(vp);
+    free(vp);
 }
diff --git a/uip/ap.c b/uip/ap.c
index 1d1ee522..8265723e 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -171,13 +171,13 @@ process (char *arg, int length)
 
 	cptr = fmt_findcomp ("text");
 	if (cptr) {
-            mh_xfree(cptr->c_text);
+            free(cptr->c_text);
 	    cptr->c_text = p->pq_text;
 	    p->pq_text = NULL;
 	}
 	cptr = fmt_findcomp ("error");
 	if (cptr) {
-            mh_xfree(cptr->c_text);
+            free(cptr->c_text);
 	    cptr->c_text = p->pq_error;
 	    p->pq_error = NULL;
 	}
@@ -186,8 +186,8 @@ process (char *arg, int length)
 	fputs (charstring_buffer (scanl), stdout);
 	charstring_free (scanl);
 
-        mh_xfree(p->pq_text);
-        mh_xfree(p->pq_error);
+        free(p->pq_text);
+        free(p->pq_error);
 	q = p->pq_next;
 	free(p);
     }
diff --git a/uip/comp.c b/uip/comp.c
index 969b9792..744ea19b 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -191,7 +191,7 @@ main (int argc, char **argv)
 		    if (*cp == '@')
 			cp = dp = path(cp + 1, TSUBCWF);
 		    fcc = addlist(fcc, cp);
-                    mh_xfree(dp);
+                    free(dp);
 		    continue;
 
 		case WIDTHSW:
diff --git a/uip/dp.c b/uip/dp.c
index dbc26705..9ed5199c 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -139,7 +139,7 @@ process (char *date, int length)
 
     cptr = fmt_findcomp ("text");
     if (cptr) {
-        mh_xfree(cptr->c_text);
+        free(cptr->c_text);
 	cptr->c_text = mh_xstrdup(date);
     }
     fmt_scan (fmt, scanl, length, dat, NULL);
diff --git a/uip/fmttest.c b/uip/fmttest.c
index 627123b4..78f08561 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -432,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;
 	    }
@@ -447,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);
 	}
@@ -529,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);
 	}
     }
 
@@ -664,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]);
 	    }
 	}
@@ -698,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]);
 	}
 
diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 775c8aeb..1ae630d5 100644
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -18,7 +18,7 @@
  */
 
 static char msgbuf[NMH_BUFSIZ];
-#define COMPFREE(c) mh_xfree(c->c_text)
+#define COMPFREE(c) free(c->c_text)
 
 /*
  * A list of components we treat as addresses
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 4af6e590..fdf59929 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -1744,7 +1744,7 @@ build_headers (CT ct, int header_encoding)
 	np = output_params(len, ct->c_dispo_first, NULL, 0);
 	vp = add(np, vp);
 	vp = add("\n", vp);
-        mh_xfree(np);
+        free(np);
 	add_header (ct, mh_xstrdup(DISPO_FIELD), vp);
     }
 
@@ -2017,7 +2017,7 @@ setup_attach_content(CT ct, char *filename)
 
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
 	if (strcasecmp(pm->pm_name, "name") == 0) {
-            mh_xfree(pm->pm_value);
+            free(pm->pm_value);
 	    pm->pm_value = mh_xstrdup(simplename);
 	    break;
 	}
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 4e7f0e69..cab759a4 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -495,7 +495,7 @@ main (int argc, char **argv) {
         status = 1;
     }
 
-    mh_xfree(maildir);
+    free(maildir);
     free (cts);
 
     if (fx.fixtypes != NULL) { svector_free (fx.fixtypes); }
@@ -866,7 +866,7 @@ replace_boundary (CT ct, char *file, char *boundary) {
                 fprintf (fpout, "%s:%s%s\n", np, new_ctline,
 			 FENDNULL(new_params));
 		free(new_ctline);
-                mh_xfree(new_params);
+                free(new_params);
             }
 
             free (vp);
@@ -2296,7 +2296,7 @@ strip_crs (CT ct, int *message_mods) {
                     if (ct->c_cefile.ce_file && ct->c_cefile.ce_unlink)
                         (void) m_unlink (ct->c_cefile.ce_file);
 
-                    mh_xfree(ct->c_cefile.ce_file);
+                    free(ct->c_cefile.ce_file);
                     ct->c_cefile.ce_file = stripped_content_file;
                     ct->c_cefile.ce_unlink = 1;
 
diff --git a/uip/mhfree.c b/uip/mhfree.c
index 936c94c7..6a827e08 100644
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -42,9 +42,9 @@ free_content (CT ct)
      */
     free_header (ct);
 
-    mh_xfree(ct->c_partno);
-    mh_xfree(ct->c_vrsn);
-    mh_xfree(ct->c_ctline);
+    free(ct->c_partno);
+    free(ct->c_vrsn);
+    free(ct->c_ctline);
     ct->c_partno = ct->c_vrsn = ct->c_ctline = NULL;
 
     free_ctinfo (ct);
@@ -77,21 +77,21 @@ free_content (CT ct)
 	    break;
     }
 
-    mh_xfree(ct->c_showproc);
-    mh_xfree(ct->c_termproc);
-    mh_xfree(ct->c_storeproc);
+    free(ct->c_showproc);
+    free(ct->c_termproc);
+    free(ct->c_storeproc);
     ct->c_showproc = ct->c_termproc = ct->c_storeproc = NULL;
 
-    mh_xfree(ct->c_celine);
+    free(ct->c_celine);
     ct->c_celine = NULL;
 
     /* free structures for content encodings */
     free_encoding (ct, 1);
 
-    mh_xfree(ct->c_id);
-    mh_xfree(ct->c_descr);
-    mh_xfree(ct->c_dispo);
-    mh_xfree(ct->c_dispo_type);
+    free(ct->c_id);
+    free(ct->c_descr);
+    free(ct->c_dispo);
+    free(ct->c_dispo_type);
     ct->c_id = ct->c_descr = ct->c_dispo = ct->c_dispo_type = NULL;
     free_pmlist (&ct->c_dispo_first);
 
@@ -106,8 +106,8 @@ free_content (CT ct)
 	ct->c_fp = NULL;
     }
 
-    mh_xfree(ct->c_storage);
-    mh_xfree(ct->c_folder);
+    free(ct->c_storage);
+    free(ct->c_folder);
     ct->c_storage = ct->c_folder = NULL;
 
     free (ct);
@@ -146,12 +146,12 @@ free_ctinfo (CT ct)
     CI ci;
 
     ci = &ct->c_ctinfo;
-    mh_xfree(ci->ci_type);
-    mh_xfree(ci->ci_subtype);
+    free(ci->ci_type);
+    free(ci->ci_subtype);
     ci->ci_type = ci->ci_subtype = NULL;
     free_pmlist(&ci->ci_first_pm);
-    mh_xfree(ci->ci_comment);
-    mh_xfree(ci->ci_magic);
+    free(ci->ci_comment);
+    free(ci->ci_magic);
     ci->ci_comment = ci->ci_magic = NULL;
 }
 
@@ -178,8 +178,8 @@ free_multi (CT ct)
     if (!(m = (struct multipart *) ct->c_ctparams))
 	return;
 
-    mh_xfree(m->mp_start);
-    mh_xfree(m->mp_stop);
+    free(m->mp_start);
+    free(m->mp_stop);
     free (m->mp_content_before);
     free (m->mp_content_after);
 	
@@ -203,7 +203,7 @@ free_partial (CT ct)
     if (!(p = (struct partial *) ct->c_ctparams))
 	return;
 
-    mh_xfree(p->pm_partid);
+    free(p->pm_partid);
 
     free(p);
     ct->c_ctparams = NULL;
@@ -219,8 +219,8 @@ free_external (CT ct)
 	return;
 
     free_content (e->eb_content);
-    mh_xfree(e->eb_body);
-    mh_xfree(e->eb_url);
+    free(e->eb_body);
+    free(e->eb_url);
     free(e);
     ct->c_ctparams = NULL;
 }
@@ -232,10 +232,10 @@ free_pmlist (PM *p)
     PM pm = *p, pm2;
 
     while (pm != NULL) {
-        mh_xfree(pm->pm_name);
-        mh_xfree(pm->pm_value);
-        mh_xfree(pm->pm_charset);
-        mh_xfree(pm->pm_lang);
+        free(pm->pm_name);
+        free(pm->pm_value);
+        free(pm->pm_charset);
+        free(pm->pm_lang);
 	pm2 = pm->pm_next;
 	free(pm);
 	pm = pm2;
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 5ff3f4dc..df0e24bf 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -913,7 +913,7 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 		SIGNAL (SIGINT, SIG_IGN);
 	    if (mhl_action == NULL && fp != stdin && fp != NULL)
 		fclose (fp);
-            mh_xfree(holder.c_text);
+            free(holder.c_text);
             holder.c_text = NULL;
 	    free_queue (&msghd, &msgtl);
 	    for (c1 = fmthd; c1; c1 = c1->c_next)
@@ -1212,8 +1212,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	}
 	charstring_free (scanl);
 
-        mh_xfree(p->pq_text);
-        mh_xfree(p->pq_error);
+        free(p->pq_text);
+        free(p->pq_error);
 	q = p->pq_next;
 	free(p);
     }
@@ -1259,10 +1259,10 @@ free_queue (struct mcomp **head, struct mcomp **tail)
 
     for (c1 = *head; c1; c1 = c2) {
 	c2 = c1->c_next;
-        mh_xfree(c1->c_name);
-        mh_xfree(c1->c_text);
-        mh_xfree(c1->c_ovtxt);
-        mh_xfree(c1->c_nfs);
+        free(c1->c_name);
+        free(c1->c_text);
+        free(c1->c_ovtxt);
+        free(c1->c_nfs);
 	if (c1->c_fmt)
 	    fmt_free (c1->c_fmt, 0);
 	free(c1);
diff --git a/uip/mhn.c b/uip/mhn.c
index 811a4ac9..4a3b33a7 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -246,7 +246,7 @@ do_cache:
 	    case FORMSW:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-                mh_xfree(formsw);
+                free(formsw);
 		formsw = getcpy (etcpath (cp));
 		continue;
 
diff --git a/uip/mhparse.c b/uip/mhparse.c
index ac8c1ce5..1dc44e7a 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -729,7 +729,7 @@ magic_skip:
      * Get any <Content-Id> given in buffer
      */
     if (magic && *cp == '<') {
-        mh_xfree(ct->c_id);
+        free(ct->c_id);
         ct->c_id = NULL;
 	if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
 	    inform("invalid ID in message %s", ct->c_file);
@@ -2745,7 +2745,7 @@ openMail (CT ct, char **file)
 
     /* showproc is for mhshow and mhstore, though mhlist -debug
      * prints it, too. */
-    mh_xfree(ct->c_showproc);
+    free(ct->c_showproc);
     ct->c_showproc = mh_xstrdup("true");
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
@@ -3396,7 +3396,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
                     inform("missing language tag in message %s's %s: field\n"
                         "    (parameter %s)", filename, fieldname, nameptr);
 		    free(nameptr);
-                    mh_xfree(charset);
+                    free(charset);
 		    return NOTOK;
 		}
 
@@ -3419,8 +3419,8 @@ parse_header_attrs (const char *filename, const char *fieldname,
                         inform("invalid encoded sequence in message %s's %s: field\n"
                             "    (parameter %s)", filename, fieldname, nameptr);
 			free(nameptr);
-                        mh_xfree(charset);
-                        mh_xfree(lang);
+                        free(charset);
+                        free(lang);
 			return NOTOK;
 		    }
 		    vp += 2;
@@ -3460,8 +3460,8 @@ bad_quote:
                         inform("invalid quoted-string in message %s's %s: field\n"
                             "    (parameter %s)", filename, fieldname, nameptr);
 			free(nameptr);
-                        mh_xfree(charset);
-                        mh_xfree(lang);
+                        free(charset);
+                        free(lang);
 			return NOTOK;
 		    case '"':
 			break;
@@ -3568,9 +3568,9 @@ bad_quote:
 	     */
 
 	    if (index == 0 && encoded) {
-                mh_xfree(pp->charset);
+                free(pp->charset);
 	    	pp->charset = charset;
-                mh_xfree(pp->lang);
+                free(pp->lang);
 		pp->lang = lang;
 	    }
 	} else {
@@ -3669,7 +3669,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 
 	if (strlen(params->pm_name) > CPERLIN) {
 	    inform("Parameter name \"%s\" is too long", params->pm_name);
-            mh_xfree(paramout);
+            free(paramout);
 	    return NULL;
 	}
 
@@ -3706,7 +3706,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 				 numchars, valoff);
 
 	    if (i == 0) {
-                mh_xfree(paramout);
+                free(paramout);
 		return NULL;
 	    }
 
@@ -3769,7 +3769,7 @@ output_params(size_t initialwidth, PM params, int *offsetout, int external)
 	    		     strlen(params->pm_value + valoff), valoff);
 
 	if (i == 0) {
-            mh_xfree(paramout);
+            free(paramout);
 	    return NULL;
 	}
 
diff --git a/uip/mhshow.c b/uip/mhshow.c
index 40beb1ca..fea40835 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -207,7 +207,7 @@ do_cache:
 	    case FORMSW:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-                mh_xfree(formsw);
+                free(formsw);
 		formsw = getcpy (etcpath (cp));
 		continue;
 
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 32d23c51..0e9b94cd 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -1070,7 +1070,7 @@ get_storeproc (CT ct)
 		free(cp);
 		return;
 	}
-        mh_xfree(cp);
+        free(cp);
     }
 
     /*
@@ -1084,7 +1084,7 @@ get_storeproc (CT ct)
 	    ct->c_storeproc = mh_xstrdup(cp);
 
     }
-    mh_xfree(cp);
+    free(cp);
 }
 
 
diff --git a/uip/picksbr.c b/uip/picksbr.c
index 90025abd..54b50e70 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -934,7 +934,7 @@ TWSaction(struct nexus *n, FILE *fp, int msgnum, long start, long stop)
 	switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {
 	    case FLD: 
 	    case FLDPLUS: 
-                mh_xfree(bp);
+                free(bp);
 		bp = mh_xstrdup(buf);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
@@ -951,7 +951,7 @@ TWSaction(struct nexus *n, FILE *fp, int msgnum, long start, long stop)
 	    case FMTERR: 
 		if (state == LENERR || state == FMTERR)
 		    inform("format error in message %d", msgnum);
-                mh_xfree(bp);
+                free(bp);
 		return 0;
 
 	    default: 
@@ -968,6 +968,6 @@ TWSaction(struct nexus *n, FILE *fp, int msgnum, long start, long stop)
 	state = n->n_after ? (twsort (tw, &n->n_tws) > 0)
 	    : (twsort (tw, &n->n_tws) < 0);
 
-    mh_xfree(bp);
+    free(bp);
     return state;
 }
diff --git a/uip/repl.c b/uip/repl.c
index 2979dd95..5f2886a2 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -239,7 +239,7 @@ main (int argc, char **argv)
 		    if (fcc)
 			fcc = add (", ", fcc);
 		    fcc = add (cp, fcc);
-                    mh_xfree(dp);
+                    free(dp);
 		    continue;
 
 		case FILESW: 
diff --git a/uip/replsbr.c b/uip/replsbr.c
index 61e76a9b..b5e10827 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -161,7 +161,7 @@ finished:
     /* set up the "fcc" pseudo-component */
     cptr = fmt_findcomp ("fcc");
     if (cptr) {
-	mh_xfree(cptr->c_text);
+	free(cptr->c_text);
 	if (fcc)
 	    cptr->c_text = mh_xstrdup(fcc);
 	else
@@ -169,7 +169,7 @@ finished:
     }
     cptr = fmt_findcomp ("user");
     if (cptr) {
-	mh_xfree(cptr->c_text);
+	free(cptr->c_text);
 	if ((cp = getenv("USER")))
 	    cptr->c_text = mh_xstrdup(cp);
 	else
diff --git a/uip/scan.c b/uip/scan.c
index c62be0f0..b0c64f1c 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -221,7 +221,7 @@ main (int argc, char **argv)
 	    ivector_push_back (seqnum, seq_getnum (mp, *ap));
 
 	num_unseen_seq = i;
-        mh_xfree(dp);
+        free(dp);
     }
 
     ontty = isatty (fileno (stdout));
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 3fd30f33..0af6f63a 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -302,7 +302,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     /* Only one part, nothing to split */
     if (nparts == 1) {
 	free (cp);
-        mh_xfree(dp);
+        free(dp);
 
 	fclose (in);
 	return sendaux (vec, vecp, program, drft, st);
@@ -408,7 +408,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     }
 
     free (cp);
-    mh_xfree(dp);
+    free(dp);
 
     fclose (in);	/* close the draft */
     return status;
diff --git a/uip/sortm.c b/uip/sortm.c
index 1546f75a..2e2809a2 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -390,8 +390,8 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 		      msg, compnum);
 		check_failed = 1;
 	    }
-            mh_xfree(datecomp);
-            mh_xfree(subjcomp);
+            free(datecomp);
+            free(subjcomp);
 	    fclose (in);
 	    return (0);
 
@@ -453,7 +453,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	smsg->s_subj = subjcomp;
     }
     fclose (in);
-    mh_xfree(datecomp);
+    free(datecomp);
 
     return (1);
 }