Add ENDNULL macro for gcc's `sentinel' function attribute.

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 265b203f1dfb9e39ee32228b38c9711212668150..2b08a6ba3b80ce0d7f487d297a6b1f9073eba728 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -15,6 +15,7 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "mhmisc.h"
 #include "../sbr/m_maildir.h"
 #include "mhfree.h"
 
@@ -46,28 +47,10 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-
-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-
 #define        quitser pipeser
 
 /* mhparse.c */
 int debugsw = 0;
-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
 
 /*
  * static prototypes
@@ -214,8 +197,7 @@ do_cache:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }
@@ -229,7 +211,7 @@ do_cache:
      */
     if ((cp = getenv ("MHSTORE"))) {
        if ((fp = fopen (cp, "r"))) {
-           readconfig ((struct node **) 0, fp, cp, 0);
+           readconfig(NULL, fp, cp, 0);
            fclose (fp);
        } else {
            admonish ("", "unable to read $MHSTORE profile (%s)", cp);
@@ -240,7 +222,7 @@ do_cache:
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
-       readconfig ((struct node **) 0, fp, cp, 0);
+       readconfig(NULL, fp, cp, 0);
        fclose (fp);
     }