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

diff --git a/imap/command.c b/imap/command.c
index a28ae7a..1232457 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -16,6 +16,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/debug.h"
@@ -74,12 +76,12 @@ 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;
-  out = (char *) mem_malloc (outlen);
+  out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
   rc = mutt_socket_write (idata->conn, out);
 
-  mem_free (&out);
+  p_delete(&out);
 
   return (rc < 0) ? IMAP_CMD_BAD : 0;
 }
@@ -188,13 +190,13 @@ int imap_exec (IMAP_DATA * idata, const char *cmd, int flags)
   cmd_make_sequence (idata);
   /* seq, space, cmd, \r\n\0 */
   outlen = str_len (idata->cmd.seq) + str_len (cmd) + 4;
-  out = (char *) mem_malloc (outlen);
+  out = p_new(char, outlen);
   snprintf (out, outlen, "%s %s\r\n", idata->cmd.seq, cmd);
 
   rc = mutt_socket_write_d (idata->conn, out,
                             flags & IMAP_CMD_PASS ? IMAP_LOG_PASS :
                             IMAP_LOG_CMD);
-  mem_free (&out);
+  p_delete(&out);
 
   if (rc < 0) {
     cmd_handle_fatal (idata);
@@ -432,7 +434,7 @@ static void cmd_parse_capabilities (IMAP_DATA * idata, char *s)
   debug_print (2, ("Handling CAPABILITY\n"));
 
   s = imap_next_word (s);
-  mem_free (&idata->capstr);
+  p_delete(&idata->capstr);
   idata->capstr = str_dup (s);
 
   memset (idata->capabilities, 0, sizeof (idata->capabilities));
@@ -580,7 +582,7 @@ static void cmd_parse_lsub (IMAP_DATA* idata, char* s) {
     err.dsize = sizeof (errstr);
     if (mutt_parse_rc_line (buf, &token, &err))
       debug_print (1, ("Error adding subscribed mailbox: %s\n", errstr));
-    mem_free (&token.data);
+    p_delete(&token.data);
   }
   else
     debug_print (1, ("Bad LSUB response\n"));