X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fcommand.c;h=6c470e80cb429688a874a948d780bf7bb679d54f;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hp=123245715f540ce907e736ee9d1cfc655c04e2af;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a;p=apps%2Fmadmutt.git

diff --git a/imap/command.c b/imap/command.c
index 1232457..6c470e8 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -17,15 +17,14 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include "mutt.h"
 #include "message.h"
 #include "mx.h"
-#include "ascii.h"
 #include "imap_private.h"
 
 #include <ctype.h>
@@ -75,7 +74,7 @@ int imap_cmd_start (IMAP_DATA * idata, const char *cmd)
 
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
+  outlen = m_strlen(idata->cmd.seq) + m_strlen(cmd) + 4;
   out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
@@ -105,7 +104,7 @@ int imap_cmd_step (IMAP_DATA * idata)
    * line */
   do {
     if (len == cmd->blen) {
-      mem_realloc (&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
+      p_realloc(&cmd->buf, cmd->blen + IMAP_CMD_BUFSIZE);
       cmd->blen = cmd->blen + IMAP_CMD_BUFSIZE;
       debug_print (3, ("grew buffer to %u bytes\n", cmd->blen));
     }
@@ -129,7 +128,7 @@ int imap_cmd_step (IMAP_DATA * idata)
 
   /* don't let one large string make cmd->buf hog memory forever */
   if ((cmd->blen > IMAP_CMD_BUFSIZE) && (len <= IMAP_CMD_BUFSIZE)) {
-    mem_realloc (&cmd->buf, IMAP_CMD_BUFSIZE);
+    p_realloc(&cmd->buf, IMAP_CMD_BUFSIZE);
     cmd->blen = IMAP_CMD_BUFSIZE;
     debug_print (3, ("shrank buffer to %u bytes\n", cmd->blen));
   }
@@ -189,7 +188,7 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
   /* create sequence for command */
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
-  outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
+  outlen = m_strlen(idata->cmd.seq) + m_strlen(cmd) + 4;
   out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
@@ -435,9 +434,9 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
 
   s = imap_next_word (s);
   p_delete(&idata->capstr);
-  idata->capstr = str_dup (s);
+  idata->capstr = m_strdup(s);
 
-  memset (idata->capabilities, 0, sizeof (idata->capabilities));
+  p_clear(idata->capabilities, 1);
 
   while (*s) {
     for (x = 0; x < CAPMAX; x++)
@@ -573,11 +572,11 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
     strfcpy (buf, "mailboxes \"", sizeof (buf));
     mutt_account_tourl (&idata->conn->account, &url);
     url.path = s;
-    if (!str_cmp (url.user, ImapUser))
+    if (!m_strcmp(url.user, ImapUser))
       url.user = NULL;
     url_ciss_tostring (&url, buf + 11, sizeof (buf) - 10, 0);
     str_cat (buf, sizeof (buf), "\"");
-    memset (&token, 0, sizeof (token));
+    p_clear(&token, 1);
     err.data = errstr;
     err.dsize = sizeof (errstr);
     if (mutt_parse_rc_line (buf, &token, &err))
@@ -597,7 +596,7 @@ static void cmd_parse_myrights (IMAP_DATA * idata, char *s)
   s = imap_next_word (s);
 
   /* zero out current rights set */
-  memset (idata->rights, 0, sizeof (idata->rights));
+  p_clear(idata->rights, 1);
 
   while (*s && !isspace ((unsigned char) *s)) {
     switch (*s) {