#include <stdlib.h>
#include <ctype.h>
-#include "lib/mem.h"
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include "mutt.h"
+#include "ascii.h"
+#include "enter.h"
#include "imap_private.h"
/* -- forward declarations -- */
if (save_lsub)
set_option (OPTIMAPCHECKSUBSCRIBED);
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return 0;
fail:
if (save_lsub)
set_option (OPTIMAPCHECKSUBSCRIBED);
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return -1;
}
mutt_sleep (0);
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return 0;
fail:
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return -1;
}
mutt_message (_("Mailbox renamed."));
mutt_sleep (0);
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return 0;
fail:
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return -1;
}
do {
if (imap_parse_list_response (idata, &name, &noselect, &noinferiors,
&idata->delim) != 0) {
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return -1;
}
}
while ((ascii_strncmp (idata->cmd.buf, idata->cmd.seq, SEQLEN) != 0));
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return 0;
}
imap_unmunge_mbox_name (folder);
if (state->entrylen + 1 == state->entrymax) {
- mem_realloc (&state->entry,
- sizeof (struct folder_file) * (state->entrymax += 256));
- memset (state->entry + state->entrylen, 0,
- (sizeof (struct folder_file) *
- (state->entrymax - state->entrylen)));
+ p_realloc(&state->entry, state->entrymax += 256);
+ p_clear(state->entry + state->entrylen,
+ state->entrymax - state->entrylen);
}
/* render superiors as unix-standard ".." */
* than at scan, since it's so expensive to scan. But that's big changes
* to browser.c */
if (!((regexec (Mask.rx, relpath, 0, NULL, 0) == 0) ^ Mask.not)) {
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
return;
}
(state->entry)[state->entrylen].inferiors = !noinferiors;
(state->entrylen)++;
- mem_free (&mx.mbox);
+ p_delete(&mx.mbox);
}
static int compare_names (struct folder_file *a, struct folder_file *b)