projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation warnings in pattern.c
[apps/madmutt.git]
/
attach.c
diff --git
a/attach.c
b/attach.c
index
e1cd5b6
..
d2ed956
100644
(file)
--- a/
attach.c
+++ b/
attach.c
@@
-30,7
+30,7
@@
#include "pager.h"
#include "copy.h"
#include "mx.h"
#include "pager.h"
#include "copy.h"
#include "mx.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include "lib/debug.h"
#include "lib/debug.h"
@@
-142,7
+142,7
@@
int mutt_compose_attachment (BODY * a)
b = mutt_read_mime_header (fp, 0);
if (b) {
if (b->parameter) {
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;
}
a->parameter = b->parameter;
b->parameter = NULL;
}
@@
-399,7
+399,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
int unlink_tempfile = 0;
is_message = mutt_is_message_type (a->type, a->subtype);
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 ||
!crypt_valid_passphrase (a->hdr->security))
return (rc);
use_mailcap = (flag == M_MAILCAP ||
@@
-865,7
+865,7
@@
int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
m->length = 0;
m->encoding = saved_encoding;
if (saved_parts) {
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;
}
m->parts = saved_parts;
m->hdr = saved_hdr;
}