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

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index ab9ddff2..f63848b3 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -206,22 +206,15 @@ mnfree (struct mailname *mp)
     if (!mp)
 	return;
 
-    if (mp->m_text)
-	free (mp->m_text);
-    if (mp->m_pers)
-	free (mp->m_pers);
-    if (mp->m_mbox)
-	free (mp->m_mbox);
-    if (mp->m_host)
-	free (mp->m_host);
-    if (mp->m_path)
-	free (mp->m_path);
-    if (mp->m_gname)
-	free (mp->m_gname);
-    if (mp->m_note)
-	free (mp->m_note);
-
-    free ((char *) mp);
+    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);
 }
 
 
@@ -308,21 +301,18 @@ ismymbox (struct mailname *np)
 	    localmailbox++;
 
 	    if ((cp = getname(am)) == NULL) {
-	        admonish (NULL, "Unable to find address in local-mailbox");
+	        inform("Unable to find address in local-mailbox, continuing...");
 		return 0;
 	    }
 
 	    if ((mq.m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
-	    	admonish (NULL, "invalid entry in local-mailbox: %s", cp);
+                inform("invalid entry in local-mailbox: %s, continuing...", cp);
 		return 0;
 	    }
 
-	    /*
-	     * Sigh, it turns out that the address parser gets messed up
-	     * if you don't call getname() until it returns NULL.
-	     */
-
-	    while ((cp = getname(am)) != NULL)
+	    /* Sigh, it turns out that the address parser gets messed up
+	     * if you don't call getname() until it returns NULL. */
+	    while (getname(am) != NULL)
 	    	;
 	}
 
@@ -333,7 +323,7 @@ ismymbox (struct mailname *np)
 	    oops = 0;
 	    while ((cp = getname (am))) {
 		if ((mp->m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
-		    admonish (NULL, "illegal address: %s", cp);
+		    inform("illegal address: %s, continuing...", cp);
 		    oops++;
 		} else {
 		    mp = mp->m_next;
@@ -359,7 +349,7 @@ ismymbox (struct mailname *np)
 		}
 	    }
 	    if (oops)
-		advise (NULL, "please fix the %s: entry in your %s file",
+		inform("please fix the %s: entry in your %s file",
 			"alternate-mailboxes", mh_profile);
 	}
 
@@ -392,7 +382,8 @@ ismymbox (struct mailname *np)
 
 	    case UUCPHOST:
 		if (strcasecmp (np->m_host, SystemName()))
-		    break;		/* fall */
+		    break;
+		    /* FALLTHRU */
 	    case LOCALHOST:
 local_test: ;
 		if (!strcasecmp (np->m_mbox, mq.m_mbox))