From 984762cd6070badb10e5dcb8d596180b5d749f70 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 17 Jul 2007 14:07:19 +0000
Subject: cleaned up code. removed conditional construct where "fromHost" could
 not     be NULL

---
 syslogd.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/syslogd.c b/syslogd.c
index 2d4a47c1..53653ac9 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1105,15 +1105,9 @@ static inline int MaskCmp(struct NetAddr *pAllow, uint8_t bits, struct sockaddr
 	assert(pFrom != NULL);
 
 	if(F_ISSET(pAllow->flags, ADDR_NAME)) {
-		dprintf ("MaskCmp: host=\"%s\"; pattern=\"%s\"\n",
-			 pszFromHost == NULL ? "(NULL)" : pszFromHost, pAllow->addr.HostWildcard);
-			 // TODO: check NULL case - can this happen at all?
+		dprintf ("MaskCmp: host=\"%s\"; pattern=\"%s\"\n", pszFromHost, pAllow->addr.HostWildcard);
 		
-		if (pszFromHost != NULL)
-			return (fnmatch (pAllow->addr.HostWildcard, pszFromHost,
-					 FNM_NOESCAPE|FNM_CASEFOLD) == 0);
-		else
-			return 0;
+		return(fnmatch(pAllow->addr.HostWildcard, pszFromHost, FNM_NOESCAPE|FNM_CASEFOLD) == 0);
 	} else {/* We need to compare an IP address */
 		switch (pFrom->sa_family) {
 		case AF_INET:
-- 
cgit