Removed version number from OpenBSD, it's in the "recent" section.

[nmh] / sbr / folder_read.c

diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index eab1e1f4bb5a89a9a563c97ad2a1a88b504017ef..18a9ec14f75ff2d7a6d0625652ff14cdc7518a59 100644 (file)
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -5,8 +5,13 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "seq_read.h"
+#include "m_atoi.h"
+#include "folder_read.h"
+#include "error.h"
+#include "h/utils.h"
+#include "m_maildir.h"
 
 /* We allocate the `mi' array 1024 elements at a time */
 #define        NUMMSGS  1024
@@ -58,7 +63,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 +73,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 */
@@ -126,7 +131,7 @@ folder_read (char *name, int lockflag)
      */
 
     if (mp->hghoff < mp->lowoff) {
-       adios(NULL, "Internal failure: high message limit < low message "
+       die("Internal failure: high message limit < low message "
              "limit; possible overflow?");
     }