From 15671f6b4a3cafcbd8b5ca0f688499b64e402afe Mon Sep 17 00:00:00 2001
From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Sat, 11 Nov 2017 00:18:51 +0000
Subject: [PATCH] folder_pack.c: Move interface to own file.

---
 Makefile.am       | 1 +
 h/prototypes.h    | 1 -
 sbr/folder_pack.c | 1 +
 sbr/folder_pack.h | 8 ++++++++
 uip/folder.c      | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 sbr/folder_pack.h

diff --git a/Makefile.am b/Makefile.am
index 93db7979..229c08c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -378,6 +378,7 @@ noinst_HEADERS = \
     sbr/folder_addmsg.h \
     sbr/folder_delmsgs.h \
     sbr/folder_free.h \
+    sbr/folder_pack.h \
     sbr/lock_file.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
diff --git a/h/prototypes.h b/h/prototypes.h
index c3fef8ac..caade24a 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -74,7 +74,6 @@ void escape_display_name (char *, size_t);
 void escape_local_part (char *, size_t);
 int ext_hook(char *, char *, char *);
 int fdcompare (int, int);
-int folder_pack (struct msgs **, int);
 
 /*
  * Read a MH folder structure and return an allocated "struct msgs"
diff --git a/sbr/folder_pack.c b/sbr/folder_pack.c
index ee2a2f90..8cacdd78 100644
--- a/sbr/folder_pack.c
+++ b/sbr/folder_pack.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "folder_pack.h"
 #include "error.h"
 
 /*
diff --git a/sbr/folder_pack.h b/sbr/folder_pack.h
new file mode 100644
index 00000000..f9a8e1ac
--- /dev/null
+++ b/sbr/folder_pack.h
@@ -0,0 +1,8 @@
+/* folder_pack.h -- pack (renumber) the messages in a folder
+ *               -- into a contiguous range from 1 to n.
+ *
+ * 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 folder_pack(struct msgs **, int);
diff --git a/uip/folder.c b/uip/folder.c
index d6e2f3d9..f30f3fc3 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/folder_pack.h"
 #include "sbr/folder_free.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
-- 
2.56.0