annosbr.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 419b1b1..e25ca9b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -454,6 +454,7 @@ noinst_HEADERS = \
     sbr/vector.h \
     sbr/vfgets.h \
     thirdparty/jsmn/jsmn.h \
     sbr/vector.h \
     sbr/vfgets.h \
     thirdparty/jsmn/jsmn.h \

+    uip/annosbr.h \

     uip/forwsbr.h \
     uip/mhfree.h \
     uip/mhmisc.h \
     uip/forwsbr.h \
     uip/mhfree.h \
     uip/mhmisc.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index f126523..aad0757 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -20,9 +20,6 @@ int pidwait (pid_t, int);
 /*
  * prototypes for some routines in uip
  */
 /*
  * prototypes for some routines in uip
  */

-int annotate (char *, char *, char *, bool, bool, int, bool);
-void annolist(char *, char *, char *, int);
-void annopreserve(int);

 int mhl(int, char **);
 int mhlsbr(int, char **, FILE *(*)(char *));
 int distout (char *, char *, char *);
 int mhl(int, char **);
 int mhlsbr(int, char **, FILE *(*)(char *));
 int distout (char *, char *, char *);

diff --git a/uip/anno.c b/uip/anno.c
index bba9408..5e3b0a2 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "annosbr.h"

 #include "sbr/m_name.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/m_name.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 6cbf32a..e9b64dc 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "annosbr.h"

 #include "sbr/m_gmprot.h"
 #include "sbr/cpydata.h"
 #include "sbr/m_backup.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/cpydata.h"
 #include "sbr/m_backup.h"

diff --git a/uip/annosbr.h b/uip/annosbr.h
new file mode 100644 (file)
index 0000000..8702c7d
--- /dev/null
+++ b/uip/annosbr.h
@@ -0,0 +1,9 @@
+/* annosbr.h -- prepend annotation to messages
+ *
+ * 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 annotate(char *, char *, char *, bool, bool, int, bool);
+void annolist(char *, char *, char *, int);
+void annopreserve(int);

diff --git a/uip/repl.c b/uip/repl.c
index 3e3b1dc..b71eb33 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "annosbr.h"

 #include "sbr/m_name.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/m_name.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 5163b1b..dce78ba 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "annosbr.h"

 #include "sbr/m_name.h"
 #include "sbr/m_getfld.h"
 #include "sbr/concat.h"
 #include "sbr/m_name.h"
 #include "sbr/m_getfld.h"
 #include "sbr/concat.h"

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index a3f036e..be3bc24 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "annosbr.h"

 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword_via_readline.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword_via_readline.h"