folder_free.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 5af20bf..93db797 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -377,6 +377,7 @@ noinst_HEADERS = \
     sbr/error.h \
     sbr/folder_addmsg.h \
     sbr/folder_delmsgs.h \
     sbr/error.h \
     sbr/folder_addmsg.h \
     sbr/folder_delmsgs.h \

+    sbr/folder_free.h \

     sbr/lock_file.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
     sbr/lock_file.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 7a6441a..c3fef8a 100644 (file)
--- 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);
 void escape_local_part (char *, size_t);
 int ext_hook(char *, char *, char *);
 int fdcompare (int, int);

-void folder_free (struct msgs *);

 int folder_pack (struct msgs **, int);
 
 /*
 int folder_pack (struct msgs **, int);
 
 /*

diff --git a/sbr/folder_free.c b/sbr/folder_free.c
index 66c07d0..2e591f2 100644 (file)
--- a/sbr/folder_free.c
+++ b/sbr/folder_free.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "folder_free.h"

 #include "h/utils.h"
 #include "lock_file.h"
 
 #include "h/utils.h"
 #include "lock_file.h"
 

diff --git a/sbr/folder_free.h b/sbr/folder_free.h
new file mode 100644 (file)
index 0000000..e587640
--- /dev/null
+++ b/sbr/folder_free.h
@@ -0,0 +1,7 @@
+/* folder_free.h -- free a folder/message structure
+ *
+ * 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 folder_free(struct msgs *);

diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index 876c105..084c6a3 100644 (file)
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "folder_free.h"

 #include "context_find.h"
 #include "path.h"
 #include "error.h"
 #include "context_find.h"
 #include "path.h"
 #include "error.h"

diff --git a/uip/anno.c b/uip/anno.c
index 508da29..2ec2ef9 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

diff --git a/uip/burst.c b/uip/burst.c
index 57d6967..c0541e8 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

diff --git a/uip/flist.c b/uip/flist.c
index 1584b0c..d94d01b 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

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

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

diff --git a/uip/folder.c b/uip/folder.c
index 02a979a..d6e2f3d 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_del.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_del.h"

diff --git a/uip/inc.c b/uip/inc.c
index ae41caa..dd5f84d 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
 #endif
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

diff --git a/uip/mark.c b/uip/mark.c
index 4bb8ca1..59a33da 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 2bb183e..f07d0f5 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/pidstatus.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/pidstatus.h"

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 7153df2..0ce3a20 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/context_save.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 469c680..8ae51c4 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/folder_addmsg.h"
 #include "sbr/context_find.h"
 #include "sbr/path.h"
 #include "sbr/folder_addmsg.h"
 #include "sbr/context_find.h"
 #include "sbr/path.h"

diff --git a/uip/packf.c b/uip/packf.c
index ebc5f53..133a9ec 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

diff --git a/uip/pick.c b/uip/pick.c
index 822f544..141d480 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 3159d1d..594bc35 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/folder_addmsg.h"
 #include "sbr/context_save.h"
 #include "sbr/context_find.h"
 #include "sbr/folder_addmsg.h"
 #include "sbr/context_save.h"
 #include "sbr/context_find.h"

diff --git a/uip/refile.c b/uip/refile.c
index 488db7f..cb9cac3 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/folder_delmsgs.h"
 #include "sbr/folder_addmsg.h"
 #include "sbr/context_save.h"
 #include "sbr/folder_delmsgs.h"
 #include "sbr/folder_addmsg.h"
 #include "sbr/context_save.h"

diff --git a/uip/rmm.c b/uip/rmm.c
index f238dae..08214a0 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/folder_delmsgs.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/folder_delmsgs.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

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

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 10d0bae..80a79f0 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/pidstatus.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
 #include "sbr/pidstatus.h"

diff --git a/uip/sortm.c b/uip/sortm.c
index e909abc..55271ff 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/folder_free.h"

 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/context_find.h"