From 29f44ca7ba8bb3788df4729d7917c53c8f489d87 Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Sat, 11 Nov 2017 00:15:30 +0000 Subject: [PATCH] folder_free.c: Move interface to own file. --- Makefile.am | 1 + h/prototypes.h | 1 - sbr/folder_free.c | 1 + sbr/folder_free.h | 7 +++++++ sbr/m_draft.c | 1 + uip/anno.c | 1 + uip/burst.c | 1 + uip/flist.c | 1 + uip/fmttest.c | 1 + uip/folder.c | 1 + uip/inc.c | 1 + uip/mark.c | 1 + uip/mhbuildsbr.c | 1 + uip/mhpath.c | 1 + uip/mhstoresbr.c | 1 + uip/packf.c | 1 + uip/pick.c | 1 + uip/rcvstore.c | 1 + uip/refile.c | 1 + uip/rmm.c | 1 + uip/scan.c | 1 + uip/sendsbr.c | 1 + uip/sortm.c | 1 + 23 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 sbr/folder_free.h diff --git a/Makefile.am b/Makefile.am index 5af20bfe..93db7979 100644 --- a/Makefile.am +++ b/Makefile.am @@ -377,6 +377,7 @@ noinst_HEADERS = \ 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 \ diff --git a/h/prototypes.h b/h/prototypes.h index 7a6441ab..c3fef8ac 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); -void folder_free (struct msgs *); int folder_pack (struct msgs **, int); /* diff --git a/sbr/folder_free.c b/sbr/folder_free.c index 66c07d0e..2e591f2e 100644 --- a/sbr/folder_free.c +++ b/sbr/folder_free.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "folder_free.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 index 00000000..e5876409 --- /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 876c1054..084c6a32 100644 --- a/sbr/m_draft.c +++ b/sbr/m_draft.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "folder_free.h" #include "context_find.h" #include "path.h" #include "error.h" diff --git a/uip/anno.c b/uip/anno.c index 508da291..2ec2ef98 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -42,6 +42,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 57d69672..c0541e8d 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 1584b0c4..d94d01bf 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -14,6 +14,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 c895c5ba..7d528c1f 100644 --- a/uip/fmttest.c +++ b/uip/fmttest.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 02a979ad..d6e2f3d9 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -8,6 +8,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 ae41caa0..dd5f84d2 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -31,6 +31,7 @@ #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" diff --git a/uip/mark.c b/uip/mark.c index 4bb8ca1a..59a33da2 100644 --- a/uip/mark.c +++ b/uip/mark.c @@ -8,6 +8,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 2bb183e3..f07d0f54 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -14,6 +14,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 7153df20..0ce3a20d 100644 --- a/uip/mhpath.c +++ b/uip/mhpath.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 469c6801..8ae51c4e 100644 --- a/uip/mhstoresbr.c +++ b/uip/mhstoresbr.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 ebc5f538..133a9ec6 100644 --- a/uip/packf.c +++ b/uip/packf.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 822f5446..141d480f 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 3159d1d2..594bc35c 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 488db7fe..cb9cac37 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -7,6 +7,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 f238daee..08214a09 100644 --- a/uip/rmm.c +++ b/uip/rmm.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 a47b8685..52343f75 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 10d0baee..80a79f01 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.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 e909abcd..55271ffc 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -6,6 +6,7 @@ */ #include "h/mh.h" +#include "sbr/folder_free.h" #include "sbr/context_save.h" #include "sbr/context_replace.h" #include "sbr/context_find.h" -- 2.56.0