use m_strdup and m_strlen that are inlined for efficiency

[apps/madmutt.git] / imap / message.c

diff --git a/imap/message.c b/imap/message.c
index 660f954..2e5b614 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -18,6 +18,7 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -33,7 +34,6 @@
 #endif
 
 #include <lib-lib/macros.h>
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #if HAVE_STDINT_H
@@ -355,7 +355,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 
   cache->uid = HEADER_DATA (h)->uid;
   mutt_mktemp (path);
-  cache->path = str_dup (path);
+  cache->path = m_strdup(path);
   if (!(msg->fp = safe_fopen (path, "w+"))) {
     p_delete(&cache->path);
     return -1;
@@ -894,7 +894,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
 #ifdef USE_HCACHE
 static size_t imap_hcache_keylen (const char *fn)
 {
-  return str_len (fn);
+  return m_strlen(fn);
 }
 
 /* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER.
@@ -950,7 +950,7 @@ static int msg_has_flag (LIST * flag_list, const char *flag)
 
   flag_list = flag_list->next;
   while (flag_list) {
-    if (!ascii_strncasecmp (flag_list->data, flag, str_len (flag_list->data)))
+    if (!ascii_strncasecmp (flag_list->data, flag, m_strlen(flag_list->data)))
       return 1;
 
     flag_list = flag_list->next;