projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move more files.
[apps/madmutt.git]
/
compose.c
diff --git
a/compose.c
b/compose.c
index
23ba10f
..
f6039fb
100644
(file)
--- a/
compose.c
+++ b/
compose.c
@@
-39,7
+39,6
@@
#include "mutt.h"
#include "alias.h"
#include "mutt_idna.h"
#include "mutt.h"
#include "alias.h"
#include "mutt_idna.h"
-#include "rfc1524.h"
#include "attach.h"
#include "recvattach.h"
#include "sort.h"
#include "attach.h"
#include "recvattach.h"
#include "sort.h"
@@
-314,7
+313,7
@@
static void draw_envelope (HEADER * msg, char *fcc)
static int edit_address_list (int line, address_t ** addr)
{
char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */
static int edit_address_list (int line, address_t ** addr)
{
char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */
- c
onst c
har *err = NULL;
+ char *err = NULL;
mutt_addrlist_to_local (*addr);
rfc822_write_address (buf, sizeof (buf), *addr, 0);
mutt_addrlist_to_local (*addr);
rfc822_write_address (buf, sizeof (buf), *addr, 0);
@@
-367,7
+366,7
@@
static int delete_attachment (MUTTMENU * menu, short *idxlen, int x)
idx[x]->content->next = NULL;
idx[x]->content->parts = NULL;
idx[x]->content->next = NULL;
idx[x]->content->parts = NULL;
-
mutt_free_body
(&(idx[x]->content));
+
body_list_wipe
(&(idx[x]->content));
p_delete(&idx[x]->tree);
p_delete(&idx[x]);
for (; x < *idxlen - 1; x++)
p_delete(&idx[x]->tree);
p_delete(&idx[x]);
for (; x < *idxlen - 1; x++)
@@
-509,7
+508,8
@@
static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
*/
int mutt_compose_menu (HEADER * msg, /* structure for new message */
char *fcc, /* where to save a copy of the message */
*/
int mutt_compose_menu (HEADER * msg, /* structure for new message */
char *fcc, /* where to save a copy of the message */
- ssize_t fcclen, HEADER * cur)
+ ssize_t fcclen,
+ HEADER * cur __attribute__ ((unused)))
{ /* current message */
char helpstr[SHORT_STRING];
char buf[LONG_STRING];
{ /* current message */
char helpstr[SHORT_STRING];
char buf[LONG_STRING];
@@
-701,7
+701,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
if ((op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
const char *tag = NULL;
if ((op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
const char *tag = NULL;
- c
onst c
har *err = NULL;
+ char *err = NULL;
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
@@
-1260,7
+1260,7
@@
int mutt_compose_menu (HEADER * msg, /* structure for new message */
idx[idxlen]->content->parts = NULL;
if (idx[idxlen]->unowned)
idx[idxlen]->content->unlink = 0;
idx[idxlen]->content->parts = NULL;
if (idx[idxlen]->unowned)
idx[idxlen]->content->unlink = 0;
-
mutt_free_body
(&idx[idxlen]->content);
+
body_list_wipe
(&idx[idxlen]->content);
p_delete(&idx[idxlen]->tree);
p_delete(&idx[idxlen]);
}
p_delete(&idx[idxlen]->tree);
p_delete(&idx[idxlen]);
}