From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 6 Jan 2012 15:22:44 +0000 (-0500)
Subject: Remove last vestiges of #ifdef BANG
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=c152db5d6a64036d4e51ec75c93b6accbb1bfa13;p=mmh

Remove last vestiges of #ifdef BANG
---

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 484ec5e..227b40b 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -280,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)
@@ -354,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"