X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a34ce71c09fe1d5dda955bbd987f3add2b3c368e..e6a316e73b70ee428ec701a5df2bcf795d4b1802:/sbr/addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index a9f16d8f..b4e6e890 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -77,7 +77,7 @@ static char adr[BUFSIZ];
 static int eai = 0;
 
 void
-enable_eai() {
+enable_eai(void) {
     eai = 1;
 }
 
@@ -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);
 }
@@ -224,9 +224,7 @@ auxformat (struct mailname *mp, int extras)
 
 	if (mp->m_nohost)
 	    strncpy (addr, FENDNULL(mp->m_mbox), sizeof(addr));
-	else
-
-	if (mp->m_type != UUCPHOST) {
+	else if (mp->m_type != UUCPHOST) {
 	    if (mp->m_host)
 	    	snprintf (addr, sizeof(addr), "%s%s@%s", FENDNULL(mp->m_path),
 			  FENDNULL(mp->m_mbox), mp->m_host);
@@ -247,12 +245,10 @@ auxformat (struct mailname *mp, int extras)
 	    snprintf (buffer, sizeof(buffer), "%s <%s>",
 		    legal_person (mp->m_pers ? mp->m_pers : mp->m_mbox),
 		    addr);
-    }
+    } else if (mp->m_note)
+        snprintf (buffer, sizeof(buffer), "%s %s", addr, mp->m_note);
     else
-	if (mp->m_note)
-	    snprintf (buffer, sizeof(buffer), "%s %s", addr, mp->m_note);
-	else
-	    strncpy (buffer, addr, sizeof(buffer));
+        strncpy (buffer, addr, sizeof(buffer));
 
     return buffer;
 }