inc/test-eom-align: Cut down on the flicker by re-ordering tests.

[nmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index 3e28ee0f55b6dd624d19c2eae0b1018d6f08bf08..4d25c38ee6e018d0a7ebac6d28d3f57d84919fc5 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -1,5 +1,4 @@
-/*
- * packf.c -- pack a nmh folder into a file
+/* packf.c -- pack a nmh folder into a file
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -9,7 +8,9 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/dropsbr.h>
+#include "h/done.h"
 #include <h/utils.h>
+#include "sbr/m_maildir.h"
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \
@@ -28,7 +29,6 @@ DEFINE_SWITCH_ARRAY(PACKF, switches);
 
 static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;
-static int mapping = 0;
 
 static void mbxclose_done(int) NORETURN;
 
@@ -47,7 +47,7 @@ main (int argc, char **argv)
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
-    done=mbxclose_done;
+    set_done(mbxclose_done);
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -82,11 +82,9 @@ main (int argc, char **argv)
 
                case MBOXSW:
                    mbx_style = MBOX_FORMAT;
-                   mapping = 0;
                    continue;
                case MMDFSW:
                    mbx_style = MMDF_FORMAT;
-                   mapping = 1;
                    continue;
            }
        }
@@ -155,7 +153,7 @@ main (int argc, char **argv)
                break;
            }
 
-           if (mbx_copy (file, mbx_style, md, fd, mapping, NULL, 1) == NOTOK)
+           if (mbx_copy (file, mbx_style, md, fd, NULL) == NOTOK)
                adios (file, "error writing to file");
 
            close (fd);
@@ -174,7 +172,7 @@ main (int argc, char **argv)
     return 1;
 }
 
-static void
+static void NORETURN
 mbxclose_done (int status)
 {
     mbx_close (file, md);