exit str_cmp enters m_strcmp

[apps/madmutt.git] / mbox.c

diff --git a/mbox.c b/mbox.c
index 030b55b..3b9fba0 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -14,6 +14,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mx.h"
@@ -27,9 +29,6 @@
 #include "compress.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <sys/stat.h>
@@ -129,7 +128,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
     if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
       break;
 
-    if (str_cmp (buf, MMDF_SEP) == 0) {
+    if (m_strcmp(buf, MMDF_SEP) == 0) {
       loc = ftello (ctx->fp);
 
       count++;
@@ -173,7 +172,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
         if (0 < tmploc && tmploc < ctx->size) {
           if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
               fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL ||
-              str_cmp (MMDF_SEP, buf) != 0) {
+              m_strcmp(MMDF_SEP, buf) != 0) {
             if (fseeko (ctx->fp, loc, SEEK_SET) != 0)
               debug_print (1, ("fseeko() failed\n"));
             hdr->content->length = -1;
@@ -192,7 +191,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
           if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL)
             break;
           lines++;
-        } while (str_cmp (buf, MMDF_SEP) != 0);
+        } while (m_strcmp(buf, MMDF_SEP) != 0);
 
         hdr->lines = lines;
         hdr->content->length = loc - hdr->content->offset;
@@ -471,7 +470,7 @@ static int _mbox_check_mailbox (CONTEXT * ctx, int *index_hint)
         debug_print (1, ("fseeko() failed\n"));
       if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL) {
         if ((ctx->magic == M_MBOX && str_ncmp ("From ", buffer, 5) == 0)
-            || (ctx->magic == M_MMDF && str_cmp (MMDF_SEP, buffer) == 0)) {
+            || (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buffer) == 0)) {
           if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
             debug_print (1, ("fseeko() failed\n"));
           if (ctx->magic == M_MBOX)
@@ -646,8 +645,8 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
     offset -= (sizeof MMDF_SEP - 1);
 
   /* allocate space for the new offsets */
-  newOffset = mem_calloc (ctx->msgcount - first, sizeof (struct m_update_t));
-  oldOffset = mem_calloc (ctx->msgcount - first, sizeof (struct m_update_t));
+  newOffset = p_new(struct m_update_t, ctx->msgcount - first);
+  oldOffset = p_new(struct m_update_t, ctx->msgcount - first);
 
   for (i = first, j = 0; i < ctx->msgcount; i++) {
     /*
@@ -753,7 +752,7 @@ static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
       /* do a sanity check to make sure the mailbox looks ok */
       fgets (buf, sizeof (buf), ctx->fp) == NULL ||
       (ctx->magic == M_MBOX && str_ncmp ("From ", buf, 5) != 0) ||
-      (ctx->magic == M_MMDF && str_cmp (MMDF_SEP, buf) != 0)) {
+      (ctx->magic == M_MMDF && m_strcmp(MMDF_SEP, buf) != 0)) {
     debug_print (1, ("message not in expected position.\n"));
     debug_print (1, ("LINE: %s\n", buf));
     i = -1;
@@ -1096,7 +1095,7 @@ int mbox_is_magic (const char* path, struct stat* st) {
     fgets (tmp, sizeof (tmp), f);
     if (str_ncmp ("From ", tmp, 5) == 0)
       magic = M_MBOX;
-    else if (str_cmp (MMDF_SEP, tmp) == 0)
+    else if (m_strcmp(MMDF_SEP, tmp) == 0)
       magic = M_MMDF;
     safe_fclose (&f);
 #ifndef BUFFY_SIZE
@@ -1140,7 +1139,7 @@ static int mmdf_commit_message (MESSAGE* msg, CONTEXT* ctx) {
 }
 
 static mx_t* reg_mx (void) {
-  mx_t* fmt = mem_calloc (1, sizeof (mx_t));
+  mx_t* fmt = p_new(mx_t, 1);
   fmt->local = 1;
   fmt->mx_check_empty = mbox_check_empty;
   fmt->mx_is_magic = mbox_is_magic;