X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=f17b0d55e4143dce1cfa628a22ea88f52907b177;hp=e1c8a3d4a959b0d275436c2fa318a37453b85b60;hb=9e6ab0152703ad301042ce8810859f41fbee405a;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/sendlib.c b/sendlib.c
index e1c8a3d..f17b0d5 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -30,7 +30,6 @@
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#include "lib/mem.h"
 #include "lib/str.h"
 #include "lib/intl.h"
 #include "lib/debug.h"
@@ -1441,7 +1440,7 @@ void mutt_write_references (LIST * r, FILE * f)
 
   for (; (TrimRef == 0 || refcnt < TrimRef) && r; r = r->next) {
     if (refcnt == refmax)
-      mem_realloc (&ref, (refmax += REF_INC) * sizeof (LIST *));
+      p_realloc(&ref, refmax += REF_INC);
     ref[refcnt++] = r;
   }
 
@@ -1650,8 +1649,7 @@ static void encode_headers (LIST * h)
       continue;
 
     rfc2047_encode_string (&tmp);
-    mem_realloc (&h->data,
-                  str_len (h->data) + 2 + str_len (tmp) + 1);
+    p_realloc(&h->data, str_len(h->data) + 2 + str_len(tmp) + 1);
 
     sprintf (h->data + i, ": %s", NONULL (tmp));        /* __SPRINTF_CHECKED__ */
 
@@ -1953,7 +1951,7 @@ add_args(const char **args, size_t *argslen, size_t *argsmax, ADDRESS * addr)
     /* weed out group mailboxes, since those are for display only */
     if (addr->mailbox && !addr->group) {
       if (*argslen == *argsmax)
-        mem_realloc (&args, (*argsmax += 5) * sizeof (char *));
+        p_realloc(&args, *argsmax += 5);
       args[(*argslen)++] = addr->mailbox;
     }
   }
@@ -1964,7 +1962,7 @@ static const char **
 add_option(const char **args, size_t *argslen, size_t *argsmax, const char *s)
 {
     if (*argslen == *argsmax) {
-        mem_realloc(&args, (*argsmax += 5) * sizeof (char *));
+        p_realloc(&args, *argsmax += 5);
     }
     args[(*argslen)++] = s;
     return (args);
@@ -2002,7 +2000,7 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
   i = 0;
   while ((ps = strtok (ps, " "))) {
     if (argslen == argsmax)
-      mem_realloc (&args, sizeof (char *) * (argsmax += 5));
+      p_realloc(&args, argsmax += 5);
 
     if (i)
       args[argslen++] = ps;
@@ -2053,7 +2051,7 @@ static int mutt_invoke_sendmail (ADDRESS * from,        /* the sender */
 #endif
 
   if (argslen == argsmax)
-    mem_realloc (&args, sizeof (char *) * (++argsmax));
+    p_realloc(&args, ++argsmax);
 
   args[argslen++] = NULL;
 
@@ -2112,7 +2110,7 @@ char *mutt_append_string (char *a, const char *b)
 {
   size_t la = str_len (a);
 
-  mem_realloc (&a, la + str_len (b) + 1);
+  p_realloc(&a, la + str_len(b) + 1);
   strcpy (a + la, b);           /* __STRCPY_CHECKED__ */
   return (a);
 }
@@ -2147,7 +2145,7 @@ char *mutt_quote_string (const char *s)
     if (INVALID_CHAR (*s)) {
       size_t o = pr - r;
 
-      mem_realloc (&r, ++rlen);
+      p_realloc(&r, ++rlen);
       pr = r + o;
       *pr++ = '\\';
     }