drop str_[n]cat.

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

diff --git a/imap/message.c b/imap/message.c
index 2e5b614..c6db226 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -18,11 +18,11 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
+#include <lib-lib/buffer.h>
 
 #include "mutt.h"
-#include "ascii.h"
-#include "buffer.h"
 #include "mutt_curses.h"
 #include "imap_private.h"
 #include "message.h"
@@ -34,6 +34,7 @@
 #endif
 
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 #include "lib/debug.h"
 
 #if HAVE_STDINT_H
@@ -131,7 +132,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
         mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1, msgend + 1);
 
       rewind (fp);
-      memset (&h, 0, sizeof (h));
+      p_clear(&h, 1);
       h.data = p_new(IMAP_HEADER_DATA, 1);
       do {
         mfhrc = 0;
@@ -222,7 +223,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
 
     /* freshen fp, h */
     rewind (fp);
-    memset (&h, 0, sizeof (h));
+    p_clear(&h, 1);
     h.data = p_new(IMAP_HEADER_DATA, 1);
 
     /* this DO loop does two things:
@@ -641,8 +642,8 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
 
   imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
 
-  memset (&sync_cmd, 0, sizeof (sync_cmd));
-  memset (&cmd, 0, sizeof (cmd));
+  p_clear(&sync_cmd, 1);
+  p_clear(&cmd, 1);
   mutt_buffer_addstr (&cmd, "UID COPY ");
 
   /* Null HEADER* means copy tagged messages */
@@ -770,8 +771,8 @@ void imap_add_keywords (char *s, HEADER * h, LIST * mailbox_flags,
 
   while (keywords) {
     if (msg_has_flag (mailbox_flags, keywords->data)) {
-      str_cat (s, slen, keywords->data);
-      str_cat (s, slen, " ");
+      m_strcat(s, slen, keywords->data);
+      m_strcat(s, slen, " ");
     }
     keywords = keywords->next;
   }
@@ -794,7 +795,7 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s)
   IMAP_HEADER newh;
   unsigned char readonly;
 
-  memset (&newh, 0, sizeof (newh));
+  p_clear(&newh, 1);
   newh.data = p_new(IMAP_HEADER_DATA, 1);
 
   debug_print (2, ("parsing FLAGS\n"));