X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap.c;h=e7fcb773569e516154209abed36d827596347a68;hp=8c7cc5e562f6801266ab589d9fa19e473ccaab0e;hb=ecaab35b973fbceb58b5ed174971c82762cc0199;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/imap/imap.c b/imap/imap.c
index 8c7cc5e..e7fcb77 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -16,9 +16,10 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "buffer.h"
 #include "mx.h"
 #include "globals.h"
@@ -31,9 +32,7 @@
 #endif
 #include "buffy.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 #include <unistd.h>
@@ -560,11 +559,11 @@ int imap_open_mailbox (CONTEXT * ctx)
   /* Clean up path and replace the one in the ctx */
   imap_fix_path (idata, mx.mbox, buf, sizeof (buf));
   p_delete(&(idata->mailbox));
-  idata->mailbox = str_dup (buf);
+  idata->mailbox = m_strdup(buf);
   imap_qualify_path (buf, sizeof (buf), &mx, idata->mailbox);
 
   p_delete(&(ctx->path));
-  ctx->path = str_dup (buf);
+  ctx->path = m_strdup(buf);
 
   idata->ctx = ctx;
 
@@ -692,8 +691,8 @@ int imap_open_mailbox (CONTEXT * ctx)
   }
 
   ctx->hdrmax = count;
-  ctx->hdrs = mem_calloc (count, sizeof (HEADER *));
-  ctx->v2r = mem_calloc (count, sizeof (int));
+  ctx->hdrs = p_new(HEADER *, count);
+  ctx->v2r = p_new(int, count);
   ctx->msgcount = 0;
   if (count && (imap_read_headers (idata, 0, count - 1) < 0)) {
     mutt_error _("Error opening mailbox");
@@ -816,8 +815,7 @@ int imap_make_msg_set (IMAP_DATA * idata, BUFFER * buf, int flag, int changed)
   int started = 0;
 
   /* make copy of header pointers to sort in natural order */
-  hdrs = mem_calloc (idata->ctx->msgcount, sizeof (HEADER *));
-  memcpy (hdrs, idata->ctx->hdrs, idata->ctx->msgcount * sizeof (HEADER *));
+  hdrs = p_dup(idata->ctx->hdrs, idata->ctx->msgcount);
 
   if (Sort != SORT_ORDER) {
     oldsort = Sort;
@@ -1210,8 +1208,8 @@ int imap_mailbox_check (char *path, int new)
       /* The mailbox name may or may not be quoted here. We could try to 
        * munge the server response and compare with quoted (or vise versa)
        * but it is probably more efficient to just strncmp against both. */
-      if (str_ncmp (mbox_unquoted, s, str_len (mbox_unquoted)) == 0
-          || str_ncmp (mbox, s, str_len (mbox)) == 0) {
+      if (str_ncmp (mbox_unquoted, s, m_strlen(mbox_unquoted)) == 0
+          || str_ncmp (mbox, s, m_strlen(mbox)) == 0) {
         s = imap_next_word (s);
         s = imap_next_word (s);
         if (isdigit ((unsigned char) *s)) {
@@ -1510,7 +1508,7 @@ static int imap_complete_hosts (char *dest, size_t len) {
   int matchlen;
   int i = 0;
 
-  matchlen = str_len (dest);
+  matchlen = m_strlen(dest);
   if (list_empty (Incoming))
     return (-1);
   for (i = 0; i < Incoming->length; i++) {
@@ -1604,14 +1602,14 @@ int imap_complete (char *dest, size_t dlen, char *path) {
       /* if the folder isn't selectable, append delimiter to force browse
        * to enter it on second tab. */
       if (noselect) {
-        clen = str_len (list_word);
+        clen = m_strlen(list_word);
         list_word[clen++] = delim;
         list_word[clen] = '\0';
       }
       /* copy in first word */
       if (!completions) {
         strfcpy (completion, list_word, sizeof (completion));
-        matchlen = str_len (completion);
+        matchlen = m_strlen(completion);
         completions++;
         continue;
       }