X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=492dd2c52a6ff793b00e2e42e99b8ab51acaf3eb;hp=6a0dc10c903fc3f18318ab47ab9c48d0f593f90d;hb=242242233895b0e113ad8d78d81bfe0170773296;hpb=06797b065bbd5d88bf473c4b9f8525dcb9990bb7

diff --git a/commands.c b/commands.c
index 6a0dc10..492dd2c 100644
--- a/commands.c
+++ b/commands.c
@@ -30,6 +30,7 @@
 #include <lib-mime/mime.h>
 
 #include <lib-sys/exit.h>
+#include <lib-sys/unix.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
@@ -241,7 +242,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   char prompt[SHORT_STRING];
   char buf[HUGE_STRING] = { 0 };
   address_t *adr = NULL;
-  char *err = NULL;
+  const char *err = NULL;
   int rc;
 
   if (h)
@@ -270,7 +271,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
     p_delete(&err);
-    address_delete (&adr);
+    address_list_wipe(&adr);
     return;
   }
 
@@ -291,7 +292,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   }
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-    address_delete (&adr);
+    address_list_wipe(&adr);
     CLEARLINE (LINES - 1);
     mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
     return;
@@ -300,7 +301,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   CLEARLINE (LINES - 1);
 
   rc = mutt_bounce_message (NULL, h, adr);
-  address_delete (&adr);
+  address_list_wipe(&adr);
   /* If no error, or background, display message. */
   if ((rc == 0) || (rc == S_BKG))
     mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
@@ -841,7 +842,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
   snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
   m_strcpy(obuf, sizeof(obuf), buf);
   if (b->parameter) {
-    size_t l;
+    ssize_t l;
 
     for (p = b->parameter; p; p = p->next) {
       l = m_strlen(buf);
@@ -856,7 +857,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     return;
 
   /* clean up previous junk */
-  parameter_delete(&b->parameter);
+  parameter_list_wipe(&b->parameter);
   p_delete(&b->subtype);
 
   mutt_parse_content_type (buf, b);