#include "pager.h"
#include "copy.h"
#include "mx.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "lib/debug.h"
b = mutt_read_mime_header (fp, 0);
if (b) {
if (b->parameter) {
- mutt_free_parameter (&a->parameter);
+ parameter_delete(&a->parameter);
a->parameter = b->parameter;
b->parameter = NULL;
}
BODY tmp;
int n;
+ p_clear(&tmp, 1);
+
if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) {
snprintf (type, len, "%s/%s",
n == TYPEAUDIO ? "audio" :
int unlink_tempfile = 0;
is_message = mutt_is_message_type (a->type, a->subtype);
- if (WithCrypto && is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
+ if (is_message && a->hdr && (a->hdr->security & ENCRYPT) &&
!crypt_valid_passphrase (a->hdr->security))
return (rc);
use_mailcap = (flag == M_MAILCAP ||
m->length = 0;
m->encoding = saved_encoding;
if (saved_parts) {
- mutt_free_header (&m->hdr);
+ header_delete(&m->hdr);
m->parts = saved_parts;
m->hdr = saved_hdr;
}