sbr/message_id.c: Move duplicate prototypes to new header.

diff --git a/Makefile.am b/Makefile.am
index c89b13e..dfcd688 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -364,6 +364,7 @@ noinst_HEADERS = \
     sbr/m_popen.h \
     sbr/m_rand.h \
     sbr/makedir.h \
     sbr/m_popen.h \
     sbr/m_rand.h \
     sbr/makedir.h \

+    sbr/message_id.h \

     thirdparty/jsmn/jsmn.h \
     uip/mhfree.h \
     uip/mhoutsbr.h \
     thirdparty/jsmn/jsmn.h \
     uip/mhfree.h \
     uip/mhoutsbr.h \

diff --git a/h/mh.h b/h/mh.h
index 77671f8..af6acf9 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -432,13 +432,6 @@ extern char *defpath;              /* pathname of user's profile      */
 extern char *ctxpath;          /* pathname of user's context      */
 extern struct node *m_defs;    /* list of profile/context entries */
 
 extern char *ctxpath;          /* pathname of user's context      */
 extern struct node *m_defs;    /* list of profile/context entries */
 

-/* What style to use for generated Message-ID and Content-ID header
-   fields.  The localname style is pid.time@localname, where time is
-   in seconds.  The random style replaces the localname with some
-   (pseudo)random bytes and uses microsecond-resolution time. */
-int save_message_id_style (const char *);
-char *message_id (time_t, int);
-

 /*
  * These standard strings are defined in config.c.  They are the
  * only system-dependent parameters in nmh, and thus by redefining
 /*
  * These standard strings are defined in config.c.  They are the
  * only system-dependent parameters in nmh, and thus by redefining

diff --git a/h/prototypes.h b/h/prototypes.h
index 5859d54..89ba298 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -233,7 +233,6 @@ int m_gmprot (void);
 char *m_name (int);
 
 void m_unknown(m_getfld_state_t *, FILE *);
 char *m_name (int);
 
 void m_unknown(m_getfld_state_t *, FILE *);

-char *message_id (time_t, int);

 
 /*
  * Return a MIME content-type string for the specified file.
 
 /*
  * Return a MIME content-type string for the specified file.

diff --git a/sbr/message_id.c b/sbr/message_id.c
index 78f1c4e..aaaab32 100644 (file)
--- a/sbr/message_id.c
+++ b/sbr/message_id.c
@@ -8,6 +8,7 @@
 
 #include <h/mh.h>
 #include "m_rand.h"
 
 #include <h/mh.h>
 #include "m_rand.h"

+#include "message_id.h"

 #include <sys/time.h>  /* for gettimeofday() */
 
 
 #include <sys/time.h>  /* for gettimeofday() */
 
 

diff --git a/sbr/message_id.h b/sbr/message_id.h
new file mode 100644 (file)
index 0000000..a1021bb
--- /dev/null
+++ b/sbr/message_id.h
@@ -0,0 +1,14 @@
+/* message_id.h -- construct the body of a Message-ID or Content-ID.
+ *
+ * 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.
+ */
+
+/* What style to use for generated Message-ID and Content-ID header
+ * fields.  The localname style is pid.time@localname, where time is
+ * in seconds.  The random style replaces the localname with some
+ * (pseudo)random bytes and uses microsecond-resolution time. */
+int save_message_id_style(const char *value);
+
+char *message_id(time_t tclock, int content_id);

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 139b2e8..7fabd2c 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -23,6 +23,7 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include "../sbr/m_mktemp.h"
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include "../sbr/m_mktemp.h"

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

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

diff --git a/uip/post.c b/uip/post.c
index 44faf72..681556b 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -16,6 +16,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include "../sbr/m_mktemp.h"
 #include <h/tws.h>
 #include <h/mts.h>
 #include "../sbr/m_mktemp.h"

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

 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 4ba5578..c0b8105 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -26,6 +26,7 @@
 #endif
 #include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"
 #endif
 #include "../sbr/m_maildir.h"
 #include "../sbr/m_mktemp.h"

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

 
 #ifdef OAUTH_SUPPORT
 static int setup_oauth_params(char *[], int *, const char *, const char **);
 
 #ifdef OAUTH_SUPPORT
 static int setup_oauth_params(char *[], int *, const char *, const char **);