From 6a9e73aa660d24cf9aa417a5ec7e7a73f6bfd266 Mon Sep 17 00:00:00 2001
From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Sat, 11 Nov 2017 14:46:28 +0000
Subject: [PATCH] m_convert.c: Move interface to own file.

---
 Makefile.am      | 1 +
 h/prototypes.h   | 1 -
 sbr/m_convert.c  | 1 +
 sbr/m_convert.h  | 7 +++++++
 sbr/m_draft.c    | 1 +
 uip/anno.c       | 1 +
 uip/burst.c      | 1 +
 uip/comp.c       | 1 +
 uip/dist.c       | 1 +
 uip/fmttest.c    | 1 +
 uip/folder.c     | 1 +
 uip/forw.c       | 1 +
 uip/mark.c       | 1 +
 uip/mhbuildsbr.c | 1 +
 uip/mhfixmsg.c   | 1 +
 uip/mhlist.c     | 1 +
 uip/mhn.c        | 1 +
 uip/mhpath.c     | 1 +
 uip/mhshow.c     | 1 +
 uip/mhstore.c    | 1 +
 uip/packf.c      | 1 +
 uip/pick.c       | 1 +
 uip/refile.c     | 1 +
 uip/repl.c       | 1 +
 uip/rmm.c        | 1 +
 uip/scan.c       | 1 +
 uip/send.c       | 1 +
 uip/sendsbr.c    | 1 +
 uip/show.c       | 1 +
 uip/sortm.c      | 1 +
 30 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 sbr/m_convert.h

diff --git a/Makefile.am b/Makefile.am
index 122fbcf2..d32f5fe4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -389,6 +389,7 @@ noinst_HEADERS = \
     sbr/lock_file.h \
     sbr/m_atoi.h \
     sbr/m_backup.h \
+    sbr/m_convert.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
     sbr/m_popen.h \
diff --git a/h/prototypes.h b/h/prototypes.h
index cfa981e9..a3793868 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -113,7 +113,6 @@ char *get_charset(void);
 /* Return malloc'd copy of str, or of "" if NULL, exit on failure. */
 char *getcpy(const char *str);
 
-int m_convert (struct msgs *, char *);
 char *m_draft (char *, char *, int, int *);
 
 m_getfld_state_t m_getfld_state_init(FILE *iob);
diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index fc198e88..f62fbb0c 100644
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "m_convert.h"
 #include "folder_realloc.h"
 #include "context_find.h"
 #include "seq_getnum.h"
diff --git a/sbr/m_convert.h b/sbr/m_convert.h
new file mode 100644
index 00000000..dca87af5
--- /dev/null
+++ b/sbr/m_convert.h
@@ -0,0 +1,7 @@
+/* m_convert.h -- parse a message range or sequence and set SELECTED
+ *
+ * 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 m_convert(struct msgs *, char *);
diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index 0ec7829b..1a4aab5d 100644
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "m_convert.h"
 #include "folder_read.h"
 #include "folder_realloc.h"
 #include "folder_free.h"
diff --git a/uip/anno.c b/uip/anno.c
index 087d4275..c0e98b25 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/burst.c b/uip/burst.c
index 962e3171..a683dc5c 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"
diff --git a/uip/comp.c b/uip/comp.c
index b07a0dc0..adffcbb6 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/fdcompare.h"
 #include "sbr/folder_read.h"
diff --git a/uip/dist.c b/uip/dist.c
index 93ca612b..8b05d9e1 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/fmttest.c b/uip/fmttest.c
index bec1b45b..46137944 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/folder.c b/uip/folder.c
index d7b8673a..2b231bb1 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_pack.h"
diff --git a/uip/forw.c b/uip/forw.c
index 9cb068fc..fa56b02a 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/mark.c b/uip/mark.c
index f6d7ab49..d39ed19c 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index e64d6833..9730e60b 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 9306c372..2193a709 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 57dd75ee..8e6274ed 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/mhn.c b/uip/mhn.c
index 9c07bc56..61e9de86 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/mhpath.c b/uip/mhpath.c
index f9147cc7..474d6f69 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_realloc.h"
diff --git a/uip/mhshow.c b/uip/mhshow.c
index 78c1eb94..c0115d51 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/mhstore.c b/uip/mhstore.c
index d5eb9b67..f935a371 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/packf.c b/uip/packf.c
index 5bf3128c..eb9ea42d 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/pick.c b/uip/pick.c
index 959ffd55..595fde7a 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/refile.c b/uip/refile.c
index 055efff9..8cf59026 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/repl.c b/uip/repl.c
index 9fecb27f..6d4e125b 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/rmm.c b/uip/rmm.c
index eb6fbf17..2049e4ff 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/scan.c b/uip/scan.c
index 942895f2..1847037f 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/send.c b/uip/send.c
index 9cc0ca59..f19ecba3 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
 #include "sbr/context_find.h"
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 82068eed..8bb04fab 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"
diff --git a/uip/show.c b/uip/show.c
index b35dcd83..697dbd80 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/context_save.h"
diff --git a/uip/sortm.c b/uip/sortm.c
index c03ac8b7..709fc6df 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"
 #include "sbr/folder_read.h"
-- 
2.56.0