X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=send.c;h=ea02d98fb1fe7525eed784be9f61ff894c109015;hb=1dc7032b59cc5b91d70076ed228bda8caf65a7f3;hp=bea5faa956f272341b2774a2e06c3749bc736965;hpb=48d5c7532ee9fdfb5d1d06483ef6bf8e3b09891d;p=apps%2Fmadmutt.git

diff --git a/send.c b/send.c
index bea5faa..ea02d98 100644
--- a/send.c
+++ b/send.c
@@ -11,6 +11,9 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "ascii.h"
@@ -26,8 +29,6 @@
 #include "url.h"
 #include "attach.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 
@@ -178,7 +179,7 @@ static ADDRESS *find_mailing_lists (ADDRESS * t, ADDRESS * c)
   return top;
 }
 
-static int edit_address (ADDRESS ** a, /* const */ char *field)
+static int edit_address (ADDRESS ** a, const char *field)
 {
   char buf[HUGE_STRING];
   char *err = NULL;
@@ -196,7 +197,7 @@ static int edit_address (ADDRESS ** a, /* const */ char *field)
       mutt_error (_("Error: '%s' is a bad IDN."), err);
       mutt_refresh ();
       mutt_sleep (2);
-      mem_free (&err);
+      p_delete(&err);
     }
   }
   while (idna_ok != 0);
@@ -217,7 +218,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
       buf[0] = 0;
     if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
       return (-1);
-    mem_free (&en->newsgroups);
+    p_delete(&en->newsgroups);
     en->newsgroups = str_dup (buf);
 
     if (en->followup_to)
@@ -227,7 +228,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     if (option (OPTASKFOLLOWUP)
         && mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
       return (-1);
-    mem_free (&en->followup_to);
+    p_delete(&en->followup_to);
     en->followup_to = str_dup (buf);
 
     if (en->x_comment_to)
@@ -237,7 +238,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
     if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
         && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
       return (-1);
-    mem_free (&en->x_comment_to);
+    p_delete(&en->x_comment_to);
     en->x_comment_to = str_dup (buf);
   }
   else
@@ -649,8 +650,8 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
    * been taken from a List-Post header.  Is that correct?
    */
   if (curenv->real_subj) {
-    mem_free (&env->subject);
-    env->subject = mem_malloc (str_len (curenv->real_subj) + 5);
+    p_delete(&env->subject);
+    env->subject = p_new(char, str_len(curenv->real_subj) + 5);
     sprintf (env->subject, "Re: %s", curenv->real_subj);        /* __SPRINTF_CHECKED__ */
   }
   else if (!env->subject)
@@ -964,7 +965,7 @@ static ADDRESS *set_reverse_name (ENVELOPE * env)
   if (tmp) {
     tmp = rfc822_cpy_adr_real (tmp);
     if (!option (OPTREVREAL))
-      mem_free (&tmp->personal);
+      p_delete(&tmp->personal);
     if (!tmp->personal)
       tmp->personal = str_dup (Realname);
   }
@@ -985,8 +986,7 @@ ADDRESS *mutt_default_from (void)
     adr = rfc822_cpy_adr_real (From);
   else if (option (OPTUSEDOMAIN)) {
     adr = rfc822_new_address ();
-    adr->mailbox =
-      mem_malloc (str_len (Username) + str_len (fqdn) + 2);
+    adr->mailbox = p_new(char, str_len(Username) + str_len(fqdn) + 2);
     sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));  /* __SPRINTF_CHECKED__ */
   }
   else {
@@ -1076,7 +1076,7 @@ static void fix_end_of_file (const char *data)
 
   if ((fp = safe_fopen (data, "a+")) == NULL)
     return;
-  fseek (fp, -1, SEEK_END);
+  fseeko (fp, -1, SEEK_END);
   if ((c = fgetc (fp)) != '\n')
     fputc ('\n', fp);
   safe_fclose (&fp);
@@ -1111,8 +1111,8 @@ int ci_send_message (int flags, /* send mode */
   char *pgpkeylist = NULL;
 
   /* save current value of "pgp_sign_as" */
-  char *signas = NULL;
-  char *tag = NULL, *err = NULL;
+  char *signas = NULL, *err = NULL;
+  const char *tag = NULL;
   char *ctype;
 
   int rv = -1;
@@ -1197,7 +1197,7 @@ int ci_send_message (int flags, /* send mode */
     if (!(ctype = str_dup (ContentType)))
       ctype = str_dup ("text/plain");
     mutt_parse_content_type (ctype, msg->content);
-    mem_free (&ctype);
+    p_delete(&ctype);
 
     msg->content->unlink = 1;
     msg->content->use_disp = 0;
@@ -1578,7 +1578,7 @@ int ci_send_message (int flags, /* send mode */
 
   if (mutt_env_to_idna (msg->env, &tag, &err)) {
     mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
-    mem_free (&err);
+    p_delete(&err);
     if (!(flags & SENDBATCH))
       goto main_loop;
     else
@@ -1653,7 +1653,7 @@ int ci_send_message (int flags, /* send mode */
           mutt_protect (msg, pgpkeylist) == -1) {
         msg->content = mutt_remove_multipart (msg->content);
 
-        mem_free (&pgpkeylist);
+        p_delete(&pgpkeylist);
 
         decode_descriptions (msg->content);
         goto main_loop;
@@ -1817,7 +1817,7 @@ int ci_send_message (int flags, /* send mode */
 #endif
 
   if (WithCrypto && (msg->security & ENCRYPT))
-    mem_free (&pgpkeylist);
+    p_delete(&pgpkeylist);
 
   if (WithCrypto && free_clear_content)
     mutt_free_body (&clear_content);
@@ -1839,7 +1839,7 @@ cleanup:
 
   if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
     if (signas) {
-      mem_free (&PgpSignAs);
+      p_delete(&PgpSignAs);
       PgpSignAs = signas;
     }
   }