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

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 50bffcf6a2bacde389712125da66ece6eecf0e61..5dae9fd7060a61a54980185b36cdcd3877a5fd82 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1201,10 +1201,9 @@ end_part:
                if (inout)
                    goto next_part;
                goto last_part;
                if (inout)
                    goto next_part;
                goto last_part;

-           } else {
-               if (strcmp (bufp + 2, m->mp_stop) == 0)
-                   goto end_part;

            }
            }

+            if (strcmp (bufp + 2, m->mp_stop) == 0)
+                goto end_part;

        }
     }
 
        }
     }
 


@@ -2324,9 +2323,8 @@ openExternal (CT ct, CT cb, CE ce, char **file, int *fd)
            ce->ce_file = mh_xstrdup(cachefile);
            ce->ce_unlink = 0;
            goto ready_already;
            ce->ce_file = mh_xstrdup(cachefile);
            ce->ce_unlink = 0;
            goto ready_already;

-       } else {
-           admonish (cachefile, "unable to fopen for reading");

        }
        }

+        admonish (cachefile, "unable to fopen for reading");

     }
 
     *fd = fileno (ce->ce_fp);
     }
 
     *fd = fileno (ce->ce_fp);