# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#endif
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#include <sys/stat.h>
static struct mapping_t PostponeHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Del"), OP_DELETE},
+ {N_("Exit"), OP_EXIT},
+ {N_("Del"), OP_DELETE},
{N_("Undel"), OP_UNDELETE},
- {N_("Help"), OP_HELP},
- {NULL}
+ {N_("Help"), OP_HELP},
+ {NULL, OP_NULL}
};
if (!PostContext->msgcount) {
PostCount = 0;
mx_close_mailbox (PostContext, NULL);
- mem_free (&PostContext);
+ p_delete(&PostContext);
mutt_error _("No postponed messages.");
return (-1);
}
else if ((h = select_msg ()) == NULL) {
mx_close_mailbox (PostContext, NULL);
- mem_free (&PostContext);
+ p_delete(&PostContext);
return (-1);
}
if (mutt_prepare_template (NULL, PostContext, hdr, h, 0) < 0) {
mx_fastclose_mailbox (PostContext);
- mem_free (&PostContext);
+ p_delete(&PostContext);
return (-1);
}
mx_close_mailbox (PostContext, NULL);
set_quadoption (OPT_DELETE, opt_delete);
- mem_free (&PostContext);
+ p_delete(&PostContext);
for (tmp = hdr->env->userhdrs; tmp;) {
if (ascii_strncasecmp ("X-Mutt-References:", tmp->data, 18) == 0) {
int rv = -1;
STATE s;
- memset (&s, 0, sizeof (s));
+ p_clear(&s, 1);
if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
return (-1);
newhdr->content->length = hdr->content->length;
mutt_parse_part (fp, newhdr->content);
- mem_free (&newhdr->env->message_id);
- mem_free (&newhdr->env->mail_followup_to); /* really? */
+ p_delete(&newhdr->env->message_id);
+ p_delete(&newhdr->env->mail_followup_to); /* really? */
/* decrypt pgp/mime encoded messages */
file[0] = '\0';
if (b->filename) {
strfcpy (file, b->filename, sizeof (file));
- b->d_filename = str_dup (b->filename);
+ b->d_filename = m_strdup(b->filename);
}
else {
/* avoid Content-Disposition: header with temporary filename */