# include "config.h"
#endif
-#include "lib/mem.h"
+#include <lib-lib/mem.h>
+
#include "lib/intl.h"
#include "lib/debug.h"
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;
}
* 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));
}
/* 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));
}
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);
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));
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"));