print_sw.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 52332b0..3f32273 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -375,6 +375,7 @@ noinst_HEADERS = \
     sbr/message_id.h \
     sbr/mime_type.h \
     sbr/print_help.h \
+    sbr/print_sw.h \
     sbr/read_line.h \
     sbr/seq_add.h \
     sbr/seq_bits.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index bd68e35..1cbc6ea 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -175,7 +175,6 @@ char *path(char *, int);
 int pidwait (pid_t, int);
 int pidstatus (int, FILE *, char *);
 char *pluspath(char *);
-void print_sw (const char *, const struct swit *, char *, FILE *);
 void print_version (char *);
 void push (void);
 char *r1bindex(char *, int) PURE;

diff --git a/sbr/ambigsw.c b/sbr/ambigsw.c
index d951af4..e36bb11 100644 (file)
--- a/sbr/ambigsw.c
+++ b/sbr/ambigsw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "print_sw.h"
 #include "error.h"
 
 

diff --git a/sbr/print_help.c b/sbr/print_help.c
index 97d140c..15d84eb 100644 (file)
--- a/sbr/print_help.c
+++ b/sbr/print_help.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "print_sw.h"
 #include "print_help.h"
 
 

diff --git a/sbr/print_sw.c b/sbr/print_sw.c
index 42df6d2..7e11a92 100644 (file)
--- a/sbr/print_sw.c
+++ b/sbr/print_sw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "print_sw.h"
 
 
 void

diff --git a/sbr/print_sw.h b/sbr/print_sw.h
new file mode 100644 (file)
index 0000000..3a5ceb0
--- /dev/null
+++ b/sbr/print_sw.h
@@ -0,0 +1,7 @@
+/* print_sw.h -- print switches
+ *
+ * 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. */
+
+void print_sw(const char *, const struct swit *, char *, FILE *);

diff --git a/sbr/read_switch_multiword.c b/sbr/read_switch_multiword.c
index af44432..d66bd25 100644 (file)
--- a/sbr/read_switch_multiword.c
+++ b/sbr/read_switch_multiword.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "print_sw.h"
 #include "h/signals.h"
 #include <setjmp.h>
 

diff --git a/sbr/read_switch_multiword_via_readline.c b/sbr/read_switch_multiword_via_readline.c
index a2c3621..7fad535 100644 (file)
--- a/sbr/read_switch_multiword_via_readline.c
+++ b/sbr/read_switch_multiword_via_readline.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "print_sw.h"
 
 #ifdef READLINE_SUPPORT
 #include <readline/readline.h>