X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=08a95c89401a496f588ebf20b4ef05917f04f418;hp=44c7f4df2c0037d5b3001629f1c89dfeaca04eca;hb=d8aeb41018aaf2f85fbd937278ffdd94164e236e;hpb=a8808601c98c76ec8344c8e4ba5a607d72c2805e diff --git a/compose.c b/compose.c index 44c7f4d..08a95c8 100644 --- a/compose.c +++ b/compose.c @@ -11,24 +11,19 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include -#include -#include -#include -#include -#include +#include #include +#include +#include +#include + #include "mutt.h" -#include "enter.h" -#include "mutt_curses.h" +#include "alias.h" #include "mutt_idna.h" -#include "mutt_menu.h" -#include "rfc1524.h" #include "attach.h" #include "recvattach.h" #include "sort.h" @@ -45,14 +40,6 @@ #include "nntp.h" #endif - -#include -#include -#include -#include -#include -#include - static const char *There_are_no_attachments = N_("There are no attachments."); #define CHECK_COUNT if (idxlen == 0) { mutt_error _(There_are_no_attachments); break; } @@ -196,7 +183,7 @@ static void redraw_crypt_lines (HEADER * msg) #ifdef MIXMASTER -static void redraw_mix_line (LIST * chain) +static void redraw_mix_line (string_list_t * chain) { int c; const char *t; @@ -316,7 +303,7 @@ static int edit_address_list (int line, address_t ** addr) mutt_addrlist_to_local (*addr); rfc822_write_address (buf, sizeof (buf), *addr, 0); if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) { - address_delete (addr); + address_list_wipe(addr); *addr = mutt_parse_adrlist (*addr, buf); *addr = mutt_expand_aliases (*addr); } @@ -364,7 +351,7 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x) 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++) @@ -398,7 +385,7 @@ static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen) static unsigned long cum_attachs_size (MUTTMENU * menu) { - size_t s; + ssize_t s; unsigned short i; ATTACHPTR **idx = menu->data; CONTENT *info; @@ -440,7 +427,7 @@ static unsigned long cum_attachs_size (MUTTMENU * menu) * help when modifying this function. */ -static const char *compose_format_str (char *buf, size_t buflen, char op, +static const char *compose_format_str (char *buf, ssize_t buflen, char op, const char *src, const char *prefix, const char *ifstring, const char *elsestring, @@ -506,7 +493,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 */ - size_t fcclen, HEADER * cur) + ssize_t fcclen, + HEADER * cur __attribute__ ((unused))) { /* current message */ char helpstr[SHORT_STRING]; char buf[LONG_STRING]; @@ -698,7 +686,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; - const char *err = NULL; + char *err = NULL; mutt_env_to_local (msg->env); mutt_edit_headers (NONULL (Editor), msg->content->filename, msg, @@ -1257,7 +1245,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; - mutt_free_body (&idx[idxlen]->content); + body_list_wipe(&idx[idxlen]->content); p_delete(&idx[idxlen]->tree); p_delete(&idx[idxlen]); }