A little closer to being somewhat useful.

[nmh] / sbr / folder_read.c

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index e742153c106117773d90621582e364912e1c51e6..1129bab0050686b890b5e257885cbee2a421fa4c 100644 (file)
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "m_maildir.h"
 
 /* We allocate the `mi' array 1024 elements at a time */
 #define        NUMMSGS  1024
@@ -27,7 +28,7 @@ folder_read (char *name, int lockflag)
     struct msgs *mp;
     struct dirent *dp;
     DIR *dd;
-    bvector_t *v;
+    struct bvector *v;
     size_t i;
 
     name = m_mailpath (name);
@@ -58,7 +59,7 @@ folder_read (char *name, int lockflag)
      * name of the messages in this folder.
      */
     len = NUMMSGS;
-    mi = (int *) mh_xmalloc ((size_t) (len * sizeof(*mi)));
+    mi = mh_xmalloc ((size_t) (len * sizeof(*mi)));
 
     while ((dp = readdir (dd))) {
        if ((msgnum = m_atoi (dp->d_name)) && msgnum > 0) {
@@ -68,7 +69,7 @@ folder_read (char *name, int lockflag)
             */
            if (mp->nummsg >= len) {
                len += NUMMSGS;
-               mi = (int *) mh_xrealloc (mi, (size_t) (len * sizeof(*mi)));
+               mi = mh_xrealloc (mi, (size_t) (len * sizeof(*mi)));
            }
 
            /* Check if this is the first message we've seen */
@@ -136,7 +137,7 @@ folder_read (char *name, int lockflag)
     mp->num_msgstats = MSGSTATNUM (mp->lowoff, mp->hghoff);
     mp->msgstats = mh_xmalloc (MSGSTATSIZE(mp));
     for (i = 0, v = mp->msgstats; i < mp->num_msgstats; ++i, ++v) {
-       *v = bvector_create (0);
+        bvector_init(v);
     }
 
     mp->msgattrs = svector_create (0);