Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh

[mmh] / uip / mhl.c

diff --git a/uip/mhl.c b/uip/mhl.c
index 45113f3..5403673 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -565,8 +565,7 @@ process(char *fname, int ofilen, int ofilec)
        FILE *fp = NULL;
        struct mcomp *c1;
 
-       switch (setjmp(env)) {
-       case OK:
+       if (setjmp(env) == 0) {
                if (fname) {
                        fp = fopen(fname, "r");
                        if (fp == NULL) {
@@ -580,20 +579,18 @@ process(char *fname, int ofilen, int ofilec)
                }
                SIGNAL(SIGINT, intrser);
                mhlfile(fp, fname, ofilen, ofilec);
-               /* FALL THROUGH! */
-       default:
-               SIGNAL(SIGINT, SIG_IGN);
-               if (fp != stdin)
-                       fclose(fp);
-               if (holder.c_text) {
-                       free(holder.c_text);
-                       holder.c_text = NULL;
-               }
-               free_queue(&msghd, &msgtl);
-               for (c1 = fmthd; c1; c1 = c1->c_next)
-                       c1->c_flags &= ~HDROUTPUT;
-               break;
        }
+
+       SIGNAL(SIGINT, SIG_IGN);
+       if (fp != stdin)
+               fclose(fp);
+       if (holder.c_text) {
+               free(holder.c_text);
+               holder.c_text = NULL;
+       }
+       free_queue(&msghd, &msgtl);
+       for (c1 = fmthd; c1; c1 = c1->c_next)
+               c1->c_flags &= ~HDROUTPUT;
 }