From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Thu, 20 Oct 2016 22:23:28 +0000 (+0100)
Subject: Don't `else' after return.  Simplify control flow.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/eebb7379a6a85da02e41d6c222b321fa80d148d1

Don't `else' after return.  Simplify control flow.
---

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 03934416..c7ea3a33 100644
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -112,7 +112,9 @@ akval (struct aka *ak, char *s)
     for (; ak; ak = ak->ak_next) {
 	if (aleq (s, ak->ak_name)) {
 	    return akresult (ak);
-	} else if (strchr (s, ':')) {
+	}
+
+        if (strchr (s, ':')) {
 	    /* The first address in a blind list will contain the
 	       alias name, so try to match, but just with just the
 	       address (not including the list name).  If there's a
@@ -158,14 +160,13 @@ aleq (char *string, char *aliasent)
 {
     char c;
 
-    while ((c = *string++))
+    while ((c = *string++)) {
 	if (*aliasent == '*')
 	    return 1;
-	else
-	    if ((c | 040) != (*aliasent | 040))
-		return 0;
-	    else
-		aliasent++;
+        if ((c | 040) != (*aliasent | 040))
+            return 0;
+        aliasent++;
+    }
 
     return (*aliasent == 0 || *aliasent == '*');
 }