* uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast

[mmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index e074505..a696e72 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -33,6 +33,8 @@ static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;
 static int mapping = 0;
 
 static int mbx_style = MBOX_FORMAT;
 static int mapping = 0;
 

+static void mbxclose_done(int) NORETURN;
+

 char *file = NULL;
 
 
 char *file = NULL;
 
 

@@ -46,6 +48,8 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
     struct msgs *mp;
     struct stat st;
 

+    done=mbxclose_done;
+

 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif

@@ -98,7 +102,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");

-           folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+           folder = pluspath (cp);

        } else
                app_msgarg(&msgs, cp);
     }
        } else
                app_msgarg(&msgs, cp);
     }

@@ -175,13 +179,13 @@ main (int argc, char **argv)
     seq_save (mp);
     context_save ();                   /* save the context file         */
     folder_free (mp);                  /* free folder/message structure */
     seq_save (mp);
     context_save ();                   /* save the context file         */
     folder_free (mp);                  /* free folder/message structure */

-    return done (0);
+    done (0);
+    return 1;

 }
 
 }
 

-int
-done (int status)
+static void
+mbxclose_done (int status)

 {
     mbx_close (file, md);
     exit (status);
 {
     mbx_close (file, md);
     exit (status);

-    return 1;  /* dead code to satisfy the compiler */

 }
 }