mhlistsbr.c: Replace list_application() with body at call site.

[nmh] / sbr / folder_free.c

diff --git a/sbr/folder_free.c b/sbr/folder_free.c
index cad86dad42a451e56a761b918ced9fa477d30a25..cf85af183a6b2b04875d55b4da8b570816c68997 100644 (file)
--- a/sbr/folder_free.c
+++ b/sbr/folder_free.c
@@ -1,6 +1,4 @@
-
-/*
- * folder_free.c -- free a folder/message structure
+/* folder_free.c -- free a folder/message structure
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -8,19 +6,20 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
+#include "lock_file.h"
 
 
 void
 folder_free (struct msgs *mp)
 {
     size_t i;
-    bvector_t *v;
+    struct bvector *v;
 
     if (!mp)
        return;
 
-    if (mp->foldpath)
-       free (mp->foldpath);
+    mh_xfree(mp->foldpath);
 
     /* free the sequence names */
     for (i = 0; i < svector_size (mp->msgattrs); i++)
@@ -28,7 +27,7 @@ folder_free (struct msgs *mp)
     svector_free (mp->msgattrs);
 
     for (i = 0, v = mp->msgstats; i < mp->num_msgstats; ++i, ++v) {
-       bvector_free (*v);
+       bvector_fini(v);
     }
     free (mp->msgstats);
 
@@ -37,8 +36,7 @@ folder_free (struct msgs *mp)
     if (mp->seqhandle)
        lkfclosedata (mp->seqhandle, mp->seqname);
 
-    if (mp->seqname)
-       free (mp->seqname);
+    mh_xfree(mp->seqname);
 
     bvector_free (mp->attrstats);
     free (mp);                 /* free main folder structure */