X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a596b2e5a67b5a250c571d4544c7726554c1ed44..8699f1cc0c8db8d3b0d6e7d607f3e92b214ec80f:/sbr/addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 6f0dcac4..eadf1d07 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);
 }
@@ -267,7 +267,7 @@ auxformat (struct mailname *mp, int extras)
  * Check if this is my address
  */
 
-int
+bool
 ismymbox (struct mailname *np)
 {
     int oops;
@@ -294,12 +294,12 @@ ismymbox (struct mailname *np)
 
 	    if ((cp = getname(am)) == NULL) {
 	        inform("Unable to find address in local-mailbox, continuing...");
-		return 0;
+		return false;
 	    }
 
 	    if ((mq.m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) {
                 inform("invalid entry in local-mailbox: %s, continuing...", cp);
-		return 0;
+		return false;
 	    }
 
 	    /* Sigh, it turns out that the address parser gets messed up
@@ -358,7 +358,7 @@ ismymbox (struct mailname *np)
     }
 
     if (np == NULL) /* XXX */
-	return 0;
+	return false;
     
     /*
      * Don't perform this "local" test if we have a Local-Mailbox set
@@ -379,7 +379,7 @@ ismymbox (struct mailname *np)
 	    case LOCALHOST:
 local_test: ;
 		if (!strcasecmp (np->m_mbox, mq.m_mbox))
-		    return 1;
+		    return true;
 		break;
 
 	    default:
@@ -417,7 +417,7 @@ local_test: ;
 	}
 
 	if (mp->m_nohost)
-	    return 1;
+	    return true;
 	if (np->m_host == NULL || mp->m_host == NULL)
 	    continue;
 	if ((len = strlen (cp = np->m_host))
@@ -441,8 +441,8 @@ local_test: ;
 		    continue;
 		break;
 	}
-	return 1;
+	return true;
     }
 
-    return 0;
+    return false;
 }