Don't `else' after goto. Simplify control flow.

[nmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index cb7d5652a04b4fb393a966803b015bff719439a0..50bffcf6a2bacde389712125da66ece6eecf0e61 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1702,8 +1702,7 @@ size_encoding (CT ct)
     if (ce->ce_file) {
        if (stat (ce->ce_file, &st) != NOTOK)
            return (long) st.st_size;
-       else
-           return 0L;
+        return 0L;
     }
 
     if (ct->c_encoding == CE_EXTERNAL)
@@ -2515,7 +2514,7 @@ openFTP (CT ct, char **file)
                  LocalName (1));
        pass = buffer;
     } else {
-       ruserpass (e->eb_site, &username, &password);
+       ruserpass (e->eb_site, &username, &password, 0);
        user = username;
        pass = password;
     }
@@ -2919,17 +2918,16 @@ readDigest (CT ct, char *cp)
             }
 
             return OK;
-        } else {
-            if (debugsw) {
-                fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
-                         (int) strlen ((char *) digest));
-            }
-
-            return NOTOK;
         }
-    } else {
+        if (debugsw) {
+            fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
+                     (int) strlen ((char *) digest));
+        }
+
         return NOTOK;
     }
+
+    return NOTOK;
 }
 
 
@@ -4136,8 +4134,7 @@ get_param(PM first, const char *name, char replace, int fetchonly)
        if (strcasecmp(name, first->pm_name) == 0) {
            if (fetchonly)
                return first->pm_value;
-           else
-               return getcpy(get_param_value(first, replace));
+            return getcpy(get_param_value(first, replace));
        }
        first = first->pm_next;
     }