X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=db5b42e67d33d35f2618c4c571e79f28bfc8410a;hp=96fa72f02a53ab74dbd612877300c2cfb55714c0;hb=ee8d01d64e8832304256de53db07228e2be67f6a;hpb=054c8779d6660afe45f38fa04510c2061aa6a605

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 96fa72f..db5b42e 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -104,7 +104,7 @@ getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 		dftype = LOCALHOST;
 	}
 
-	mp = (struct mailname *) mh_xcalloc((size_t) 1, sizeof(*mp));
+	mp = mh_xcalloc(1, sizeof(*mp));
 	if (mp == NULL) {
 		if (eresult)
 			strcpy(eresult, "insufficient memory to represent address");
@@ -114,31 +114,31 @@ getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 	}
 
 	mp->m_next = NULL;
-	mp->m_text = getcpy(str);
+	mp->m_text = mh_xstrdup(str);
 	if (pers)
-		mp->m_pers = getcpy(pers);
+		mp->m_pers = mh_xstrdup(pers);
 
 	if (mbox == NULL) {
 		mp->m_type = BADHOST;
 		mp->m_nohost = 1;
 		mp->m_ingrp = ingrp;
-		mp->m_gname = getcpy(grp);
+		mp->m_gname = mh_xstrdup(grp);
 		if (note)
-			mp->m_note = getcpy(note);
+			mp->m_note = mh_xstrdup(note);
 		return mp;
 	}
 
 	if (host) {
-		mp->m_mbox = getcpy(mbox);
-		mp->m_host = getcpy(host);
+		mp->m_mbox = mh_xstrdup(mbox);
+		mp->m_host = mh_xstrdup(host);
 	} else {
 		mp->m_nohost = 1;
-		mp->m_mbox = getcpy(mbox);
+		mp->m_mbox = mh_xstrdup(mbox);
 		if (route == NULL && dftype == LOCALHOST) {
 			mp->m_host = NULL;
 			mp->m_type = dftype;
 		} else {
-			mp->m_host = route ? NULL : getcpy(dfhost);
+			mp->m_host = route ? NULL : mh_xstrdup(dfhost);
 			mp->m_type = route ? NETHOST : dftype;
 		}
 		goto got_host;
@@ -152,12 +152,12 @@ getm(char *str, char *dfhost, int dftype, int wanthost, char *eresult)
 
 got_host: ;
 	if (route)
-		mp->m_path = getcpy(route);
+		mp->m_path = mh_xstrdup(route);
 	mp->m_ingrp = ingrp;
 	if (grp)
-		mp->m_gname = getcpy(grp);
+		mp->m_gname = mh_xstrdup(grp);
 	if (note)
-		mp->m_note = getcpy(note);
+		mp->m_note = mh_xstrdup(note);
 
 	return mp;
 }
@@ -170,21 +170,21 @@ mnfree(struct mailname *mp)
 		return;
 
 	if (mp->m_text)
-		free(mp->m_text);
+		mh_free0(&(mp->m_text));
 	if (mp->m_pers)
-		free(mp->m_pers);
+		mh_free0(&(mp->m_pers));
 	if (mp->m_mbox)
-		free(mp->m_mbox);
+		mh_free0(&(mp->m_mbox));
 	if (mp->m_host)
-		free(mp->m_host);
+		mh_free0(&(mp->m_host));
 	if (mp->m_path)
-		free(mp->m_path);
+		mh_free0(&(mp->m_path));
 	if (mp->m_gname)
-		free(mp->m_gname);
+		mh_free0(&(mp->m_gname));
 	if (mp->m_note)
-		free(mp->m_note);
+		mh_free0(&(mp->m_note));
 
-	free((char *) mp);
+	mh_free0(&mp);
 }
 
 
@@ -436,7 +436,7 @@ error:
 	while (first->m_next != NULL && first->m_next != next) {
 		mp = first->m_next;
 		first->m_next = mp->m_next;
-		free(mp);
+		mh_free0(&mp);
 	}
 	first->m_next = next;
 	return -1;