read_switch.c: Move interface declaration to own file.

diff --git a/Makefile.am b/Makefile.am
index 3db6bfa..fb982b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -419,6 +419,7 @@ noinst_HEADERS = \
     sbr/push.h \
     sbr/r1bindex.h \
     sbr/read_line.h \
     sbr/push.h \
     sbr/r1bindex.h \
     sbr/read_line.h \

+    sbr/read_switch.h \

     sbr/readconfig.h \
     sbr/refile.h \
     sbr/remdir.h \
     sbr/readconfig.h \
     sbr/refile.h \
     sbr/remdir.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 970cd21..dff1a03 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -15,13 +15,6 @@ char *etcpath(char *) NONNULL(1);
 
 struct msgs_array;
 
 
 struct msgs_array;
 

-/*
- * Print null-terminated PROMPT to and flush standard output.  Read answers from
- * standard input until one matches an entry in SWITCHES.  When one matches,
- * return its swret field.  Return 0 on EOF.
- */
-int read_switch(const char *PROMPT, const struct swit *SWITCHES);
-

 /*
  * If standard input is not a tty, return 1 without printing anything.  Else,
  * print null-terminated PROMPT to and flush standard output.  Read answers from
 /*
  * If standard input is not a tty, return 1 without printing anything.  Else,
  * print null-terminated PROMPT to and flush standard output.  Read answers from

diff --git a/sbr/read_switch.c b/sbr/read_switch.c
index 8cdbfe4..1c3e851 100644 (file)
--- a/sbr/read_switch.c
+++ b/sbr/read_switch.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "read_switch.h"

 #include "smatch.h"
 
 
 #include "smatch.h"
 
 

diff --git a/sbr/read_switch.h b/sbr/read_switch.h
new file mode 100644 (file)
index 0000000..2ee51ce
--- /dev/null
+++ b/sbr/read_switch.h
@@ -0,0 +1,12 @@
+/* read_switch.h -- prompt the user for an answer from the list
+ *
+ * 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. */
+
+/*
+ * Print null-terminated PROMPT to and flush standard output.  Read answers from
+ * standard input until one matches an entry in SWITCHES.  When one matches,
+ * return its swret field.  Return 0 on EOF.
+ */
+int read_switch(const char *, const struct swit *);

diff --git a/sbr/read_yes_or_no_if_tty.c b/sbr/read_yes_or_no_if_tty.c
index 8d7dac6..15450c5 100644 (file)
--- a/sbr/read_yes_or_no_if_tty.c
+++ b/sbr/read_yes_or_no_if_tty.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "read_switch.h"

 
 
 int
 
 
 int

diff --git a/uip/install-mh.c b/uip/install-mh.c
index ee05102..97e1ac4 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/read_switch.h"

 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/context_save.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/context_save.h"

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

+#include "sbr/read_switch.h"

 #include "sbr/concat.h"
 #include "sbr/closefds.h"
 #include "sbr/uprf.h"
 #include "sbr/concat.h"
 #include "sbr/closefds.h"
 #include "sbr/uprf.h"