mhbuildsbr.c: Include mhcachesbr.h. Delete copy of prototype.

[nmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index cf3940b448cb5cfbb2773eccf6f66e5c38914dee..b3d3218c153dedbddaa438586e7fe7294ea4fc90 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -16,7 +16,9 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>

+#include "mhmisc.h"

 #include "../sbr/m_maildir.h"
 #include "../sbr/m_maildir.h"

+#include "../sbr/m_popen.h"

 #include "mhfree.h"
 #include "mhshowsbr.h"
 
 #include "mhfree.h"
 #include "mhshowsbr.h"
 


@@ -65,13 +67,6 @@ DEFINE_SWITCH_ARRAY(MHSHOW, switches);
 #undef X
 
 
 #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[];
 /* mhparse.c */
 extern char *preferred_types[];
 extern  char *preferred_subtypes[];


@@ -85,11 +80,6 @@ int verbosw = 0;
 /* mhparse.c */
 CT parse_mime (char *);
 
 /* mhparse.c */
 CT parse_mime (char *);
 

-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -272,8 +262,7 @@ do_cache:
        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!");

-           else
-               folder = pluspath (cp);
+            folder = pluspath (cp);

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