uip/mhoutsbr.c: Move exported prototype to new header file.

Alter the callers to include the new header file instead of having their
own copy of the prototype.

diff --git a/Makefile.am b/Makefile.am
index 7a894680a74f9fdaffda0bf2d3a43388a6e03e6e..89c84b91f593ce47afe561984c38b08d8158650d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -361,6 +361,7 @@ noinst_HEADERS = \
     sbr/m_mktemp.h \
     thirdparty/jsmn/jsmn.h \
     uip/mhfree.h \
+    uip/mhoutsbr.h \
     #
 
 ##

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 1ef90e364986d354114ceb6284e776de813e16f9..686941ffafa461d03c0c243dc1ee056ee5839014 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -16,6 +16,7 @@
 #include <h/utils.h>
 #include "../sbr/m_mktemp.h"
 #include "mhfree.h"
+#include "mhoutsbr.h"
 
 #define MHBUILD_SWITCHES \
     X("auto", 0, AUTOSW) \
@@ -93,9 +94,6 @@ static int unlink_outfile = 0;
 
 static void unlink_done (int) NORETURN;
 
-/* mhbuildsbr.c */
-int output_message_fp (CT, FILE *, char*);
-
 
 int
 main (int argc, char **argv)

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 9d676cbe4eaa4548a2108aec148ec5cdec7256bd..549cffe984f54b8af0f254f552419bfffd7ffe69 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -12,6 +12,7 @@
 #include <h/signals.h>
 #include "../sbr/m_mktemp.h"
 #include "mhfree.h"
+#include "mhoutsbr.h"
 #include <fcntl.h>
 
 #define MHFIXMSG_SWITCHES \
@@ -63,9 +64,6 @@ extern int bogus_mp_content;                  /* flag from InitMultiPart */
 /* flags to/from parse_header_attrs */
 extern int suppress_extraneous_trailing_semicolon_warning;
 
-/* mhoutsbr.c */
-int output_message_fp (CT, FILE *, char *);
-
 /* mhmisc.c */
 void flush_errors (void);
 

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index bbddbc903a122a3ee285989b7ec48fd3cb19e48b..65d9640cb19cca04418d6d38f2415807ea26ac80 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -14,13 +14,9 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include "mhoutsbr.h"
 
 
-/*
- * prototypes
- */
-int output_message_fp (CT, FILE *, char *);
-
 /*
  * static prototypes
  */

diff --git a/uip/mhoutsbr.h b/uip/mhoutsbr.h
new file mode 100644 (file)
index 0000000..97b2eed
--- /dev/null
+++ b/uip/mhoutsbr.h
@@ -0,0 +1,8 @@
+/* mhoutsbr.h -- output MIME messages from a Content structure.
+ *
+ * This code is Copyright (c) 2017, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
+ */
+
+int output_message_fp(CT ct, FILE *fp, char *file);