mhlsbr.c: Delete file-static function pointer mhl_action.

[nmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index 14a7129d66675619cde104e4cba4191825722b09..94a18eff2697d0930f0493fccb9f7efba862c9d9 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>

+#include "sbr/m_maildir.h"

 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \


@@ -27,7 +28,6 @@ DEFINE_SWITCH_ARRAY(PACKF, switches);
 
 static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;
 
 static int md = NOTOK;
 static int mbx_style = MBOX_FORMAT;

-static int mapping = 0;

 
 static void mbxclose_done(int) NORETURN;
 
 
 static void mbxclose_done(int) NORETURN;
 


@@ -81,11 +81,9 @@ main (int argc, char **argv)
 
                case MBOXSW:
                    mbx_style = MBOX_FORMAT;
 
                case MBOXSW:
                    mbx_style = MBOX_FORMAT;

-                   mapping = 0;

                    continue;
                case MMDFSW:
                    mbx_style = MMDF_FORMAT;
                    continue;
                case MMDFSW:
                    mbx_style = MMDF_FORMAT;

-                   mapping = 1;

                    continue;
            }
        }
                    continue;
            }
        }


@@ -154,7 +152,7 @@ main (int argc, char **argv)
                break;
            }
 
                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);
                adios (file, "error writing to file");
 
            close (fd);


@@ -173,7 +171,7 @@ main (int argc, char **argv)
     return 1;
 }
 
     return 1;
 }
 

-static void
+static void NORETURN

 mbxclose_done (int status)
 {
     mbx_close (file, md);
 mbxclose_done (int status)
 {
     mbx_close (file, md);