and less size_t's

[apps/madmutt.git] / compose.c

diff --git a/compose.c b/compose.c
index a37955e..4bf5cf1 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -198,7 +198,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;
@@ -313,12 +313,12 @@ 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 */
-  char *err = NULL;
+  const char *err = NULL;
 
   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);
   }
@@ -400,7 +400,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;
@@ -442,7 +442,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,
@@ -508,7 +508,7 @@ 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)
 {                               /* current message */
   char helpstr[SHORT_STRING];
   char buf[LONG_STRING];