X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Faddrsbr.c;h=227b40bc3a50fc75beb72971bda0ee0bb6efb18f;hb=6bd76adcc81f4a725352c338a39212bcdefb0a4b;hp=fa45e31a51812d16679b511a575b1bcd4a62d9bc;hpb=d2f12554a254e814dcdafb3828fc0d9936154eef;p=mmh

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index fa45e31..227b40b 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -2,8 +2,6 @@
 /*
  * addrsbr.c -- parse addresses 822-style
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -119,7 +117,7 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult)
     char *dp;
 #endif /* not DUMB */
 
-    if (err && err[0]) {
+    if (err[0]) {
 	if (eresult)
 	    strcpy (eresult, err);
 	else
@@ -282,12 +280,10 @@ auxformat (struct mailname *mp, int extras)
 	else
 #endif /* DUMB */
 
-#ifndef	BANG
 	if (mp->m_type != UUCPHOST)
 	    snprintf (addr, sizeof(addr), mp->m_host ? "%s%s@%s" : "%s%s",
 		empty(mp->m_path), empty(mp->m_mbox), mp->m_host);
 	else
-#endif /* not BANG */
 	    snprintf (addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox);
 
     if (!extras)
@@ -356,11 +352,7 @@ adrsprintf (char *username, char *domain)
     if (domain == NULL)
 	domain = LocalName();
 
-#ifndef	BANG
     snprintf_return = snprintf (addr, sizeof(addr), "%s@%s", username, domain);
-#else /* BANG */
-    snprintf_return = snprintf (addr, sizeof(addr), "%s!%s", domain, username);
-#endif /* BANG */
 
     if (snprintf_return < 0 || snprintf_return >= sizeof(addr))
 	adios(NULL, "snprintf() error writing username (%d chars), domain (%d"