X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9514ca81bd12a47df977822efc14ff285bd5bc10..4974d09cc659e2859fcf916ad020628c9695e2f8:/sbr/addrsbr.c

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 68bb6dec..6d883ea1 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;
 }
 
@@ -89,7 +89,7 @@ getname (const char *addrs)
     pers = mbox = host = route = grp = note = NULL;
     err[0] = '\0';
 
-    if ((ap = getadrx (addrs ? addrs : "", eai)) == NULL) {
+    if ((ap = getadrx (FENDNULL(addrs), eai)) == NULL) {
 	return NULL;
     }
 
@@ -216,8 +216,6 @@ mnfree (struct mailname *mp)
 }
 
 
-#define empty(s) ((s) ? (s) : "")
-
 char *
 auxformat (struct mailname *mp, int extras)
 {
@@ -225,15 +223,15 @@ auxformat (struct mailname *mp, int extras)
     static char buffer[BUFSIZ];
 
 	if (mp->m_nohost)
-	    strncpy (addr, mp->m_mbox ? mp->m_mbox : "", sizeof(addr));
+	    strncpy (addr, FENDNULL(mp->m_mbox), sizeof(addr));
 	else
 
 	if (mp->m_type != UUCPHOST) {
 	    if (mp->m_host)
-	    	snprintf (addr, sizeof(addr), "%s%s@%s", empty(mp->m_path),
-			  empty(mp->m_mbox), mp->m_host);
-	    else snprintf (addr, sizeof(addr), "%s%s", empty(mp->m_path),
-	    		   empty(mp->m_mbox));
+	    	snprintf (addr, sizeof(addr), "%s%s@%s", FENDNULL(mp->m_path),
+			  FENDNULL(mp->m_mbox), mp->m_host);
+	    else snprintf (addr, sizeof(addr), "%s%s", FENDNULL(mp->m_path),
+	    		   FENDNULL(mp->m_mbox));
 	} else
 	    snprintf (addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox);
 
@@ -355,8 +353,8 @@ ismymbox (struct mailname *np)
 	    for (mp = &mq; mp; mp = mp->m_next) {
 	      fprintf (stderr, "Local- or Alternate-Mailbox: text=\"%s\" "
 		       "mbox=\"%s\" host=\"%s\" %s\n",
-		       mp->m_text ? mp->m_text : "", mp->m_mbox,
-		       mp->m_host ? mp->m_host : "",
+		       FENDNULL(mp->m_text), mp->m_mbox,
+		       FENDNULL(mp->m_host),
 		       snprintb (buffer, sizeof(buffer), (unsigned) mp->m_type,
 				 WBITS));
 	    }