fmt_addr.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 4efbe3647c504e086e1d092051049903fb927a10..865b70a635761f2c9f70ed3efcaecfbb9c590d4a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -386,6 +386,7 @@ noinst_HEADERS = \
     sbr/escape_addresses.h \
     sbr/ext_hook.h \
     sbr/fdcompare.h \
+    sbr/fmt_addr.h \
     sbr/fmt_rfc2047.h \
     sbr/folder_addmsg.h \
     sbr/folder_delmsgs.h \

diff --git a/h/fmt_scan.h b/h/fmt_scan.h
index 2574c5798662be55d1dcfda32dc7dfe19caa7f6d..dc945ef3306534e7cda42b2a3d5fcc673a4e46e3 100644 (file)
--- a/h/fmt_scan.h
+++ b/h/fmt_scan.h
@@ -289,25 +289,3 @@ void fmt_appendcomp(int bucket, char *component, char *text);
  */
 
 struct comp *fmt_nextcomp(struct comp *comp, unsigned int *bucket);
-
-/*
- * The implementation of the %(formataddr) function.  This is available for
- * programs to provide their own local implementation if they wish to do
- * special processing (see uip/replsbr.c for an example).  Arguments are:
- *
- * orig                - Existing list of addresses
- * str         - New address(es) to append to list.
- *
- * This function returns an allocated string containing the new list of
- * addresses.
- */
-
-char *formataddr(char *orig, char *str);
-
-/*
- * The implementation of the %(concataddr) function.  Arguments and behavior
- * are the same as %(formataddr).  Again, see uip/replsbr.c to see how you
- * can override this behavior.
- */
-
-char *concataddr(char *orig, char *str);

diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c
index fc9c4db0110577303351349510c357ef5c6ee65f..6d58061920f8ced75f96b39ecdb477428bc34314 100644 (file)
--- a/sbr/fmt_addr.c
+++ b/sbr/fmt_addr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "fmt_addr.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"
 #include "h/utils.h"

diff --git a/sbr/fmt_addr.h b/sbr/fmt_addr.h
new file mode 100644 (file)
index 0000000..2a7c512
--- /dev/null
+++ b/sbr/fmt_addr.h
@@ -0,0 +1,25 @@
+/* fmt_addr.h -- format an address field (from fmt_scan)
+ *
+ * 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. */
+
+/*
+ * The implementation of the %(formataddr) function.  This is available for
+ * programs to provide their own local implementation if they wish to do
+ * special processing (see uip/replsbr.c for an example).  Arguments are:
+ *
+ * orig                - Existing list of addresses
+ * str         - New address(es) to append to list.
+ *
+ * This function returns an allocated string containing the new list of
+ * addresses.
+ */
+char *formataddr(char *, char *);
+
+/*
+ * The implementation of the %(concataddr) function.  Arguments and behavior
+ * are the same as %(formataddr).  Again, see uip/replsbr.c to see how you
+ * can override this behavior.
+ */
+char *concataddr(char *, char *);

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 869a278ef69287a6696011b793d9294c70878844..9ae100c9fdd3f7a72d7bf3cfa1e47600c8002113 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -9,6 +9,7 @@
  */
 
 #include "h/mh.h"
+#include "fmt_addr.h"
 #include "dtime.h"
 #include "strindex.h"
 #include "fmt_rfc2047.h"