X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/836f8eb0eda25f31b82c07384fc9b1fb60ce7182..01fd4094faf9fa892faad3621433e5faa98157f9:/uip/mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index 1283a1ab..4a3b33a7 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -17,7 +17,7 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include "mhfree.h"
 #include "mhshowsbr.h"
 
@@ -76,13 +76,6 @@ DEFINE_SWITCH_ARRAY(MHN, switches);
 #undef X
 
 
-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-
 int debugsw = 0;
 int verbosw = 0;
 
@@ -102,9 +95,6 @@ static int storesw = 0;
 
 #define	quitser	pipeser
 
-/* mhparse.c */
-CT parse_mime (char *);
-
 /*
  * static prototypes
  */
@@ -256,7 +246,7 @@ do_cache:
 	    case FORMSW:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-                mh_xfree(formsw);
+                free(formsw);
 		formsw = getcpy (etcpath (cp));
 		continue;
 
@@ -321,7 +311,7 @@ do_cache:
      */
     if ((cp = getenv ("MHN"))) {
 	if ((fp = fopen (cp, "r"))) {
-	    readconfig ((struct node **) 0, fp, cp, 0);
+	    readconfig(NULL, fp, cp, 0);
 	    fclose (fp);
 	} else {
 	    admonish ("", "unable to read $MHN profile (%s)", cp);
@@ -332,7 +322,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);
     }