seq_getnum.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 314288cfe4e5aea03281de034d431a4b59e3bfd5..13b6d662da3cacbb574282c348e416fef139bd4d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -377,6 +377,7 @@ noinst_HEADERS = \
     sbr/read_line.h \
     sbr/seq_add.h \
     sbr/seq_del.h \
     sbr/read_line.h \
     sbr/seq_add.h \
     sbr/seq_del.h \

+    sbr/seq_getnum.h \

     sbr/seq_print.h \
     sbr/terminal.h \
     sbr/unquote.h \
     sbr/seq_print.h \
     sbr/terminal.h \
     sbr/unquote.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 255f175833866985314e84f5b0f025b20b6ce762..3e7d89799c30e06ad6307487b227332642a5327c 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -204,7 +204,6 @@ int remdir (char *);
 void scan_detect_mbox_style (FILE *);
 void scan_finished(void);
 char *seq_bits (struct msgs *);
 void scan_detect_mbox_style (FILE *);
 void scan_finished(void);
 char *seq_bits (struct msgs *);

-int seq_getnum (struct msgs *, char *);

 char *seq_list (struct msgs *, char *);
 int seq_nameok (char *);
 
 char *seq_list (struct msgs *, char *);
 int seq_nameok (char *);
 

diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index 64346fb9b84b8f1ab1f7a53d64135656356c98cf..d5d069053092d2bf3c8af7b4e056be3f2f2d1c00 100644 (file)
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "seq_getnum.h"

 #include "error.h"
 #include "h/utils.h"
 
 #include "error.h"
 #include "h/utils.h"
 

diff --git a/sbr/seq_getnum.h b/sbr/seq_getnum.h
new file mode 100644 (file)
index 0000000..a6668e4
--- /dev/null
+++ b/sbr/seq_getnum.h
@@ -0,0 +1,8 @@
+/* seq_getnum.h -- find the index for a sequence
+ *              -- return -1 if sequence doesn't exist
+ *
+ * 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 seq_getnum(struct msgs *, char *);

diff --git a/sbr/seq_list.c b/sbr/seq_list.c
index 20617a54af44436a95899a0014bebe897a2d1fc7..5344510d59298fe8a4f895544c83ebeb14b11385 100644 (file)
--- a/sbr/seq_list.c
+++ b/sbr/seq_list.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "seq_getnum.h"

 #include "h/utils.h"
 
 /* allocate this much buffer space at a time */
 #include "h/utils.h"
 
 /* allocate this much buffer space at a time */

diff --git a/sbr/seq_print.c b/sbr/seq_print.c
index 6139bc14e993465e82c6608f098b9cc6b66976bf..e37c0eaec2bf890e158b84098da33ba1dcbe1307 100644 (file)
--- a/sbr/seq_print.c
+++ b/sbr/seq_print.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "seq_getnum.h"

 #include "seq_print.h"
 
 /*
 #include "seq_print.h"
 
 /*

diff --git a/sbr/seq_setunseen.c b/sbr/seq_setunseen.c
index 298f26371c6bc489fb16498c10567fac65264ad2..4c92f156e4fd322b4ff9ec425ff231dc3e72c398 100644 (file)
--- a/sbr/seq_setunseen.c
+++ b/sbr/seq_setunseen.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "seq_getnum.h"

 #include "seq_del.h"
 #include "seq_add.h"
 #include "h/utils.h"
 #include "seq_del.h"
 #include "seq_add.h"
 #include "h/utils.h"

diff --git a/uip/flist.c b/uip/flist.c
index 4435d2da79508e42552ad60cf5e255ebb00fb7b5..47b6922b921bf0e73a724cca1c687af4b7d9fbf1 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/seq_getnum.h"

 #include "sbr/error.h"
 #include "h/utils.h"
 #include "h/done.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include "h/done.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 4214ab1b2b8858372c505ad3bcaaa005b2b0e54e..719214a655f38dbd07f4a36cedc8bd1a52db0e1c 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/seq_getnum.h"

 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"

diff --git a/uip/refile.c b/uip/refile.c
index 98df16a82c75d7ae67900ee15ddf342bfa90252b..2e9da1c6ee7fc3c8e2045ba1185808e19aedd5d7 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/seq_getnum.h"

 #include "sbr/seq_add.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"
 #include "sbr/seq_add.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"

diff --git a/uip/scan.c b/uip/scan.c
index 8a8a59b1b23c51535f431a626c01ff96f32a2460..f39ef09680d4015dc8136c27592f451ef491f81c 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/seq_getnum.h"

 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/scansbr.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/scansbr.h"