#include <ctype.h>
#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 "mutt_curses.h"
#include "imap_private.h"
#include "pgp.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#if HAVE_STDINT_H
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;
/* 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:
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;
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 */
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"));
#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.
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;