drop mem_alloc and mem_free, use my own hand crafted optmized macros that

[apps/madmutt.git] / gnupgparse.c

diff --git a/gnupgparse.c b/gnupgparse.c
index c29ab84..080bc29 100644 (file)
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -33,6 +33,8 @@
 #include <time.h>
 #include <ctype.h>
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "pgp.h"
 #include "charset.h"
@@ -84,13 +86,13 @@ static void fix_uid (char *uid)
   if (_chs && (cd = mutt_iconv_open (_chs, "utf-8", 0)) != (iconv_t) - 1) {
     int n = s - uid + 1;        /* chars available in original buffer */
     char *buf;
-    ICONV_CONST char *ib;
+    const char *ib;
     char *ob;
     size_t ibl, obl;
 
-    buf = mem_malloc (n + 1);
+    buf = p_new(char, n + 1);
     ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
-    iconv (cd, &ib, &ibl, &ob, &obl);
+    my_iconv(cd, &ib, &ibl, &ob, &obl);
     if (!ibl) {
       if (ob - buf < n) {
         memcpy (uid, buf, ob - buf);
@@ -99,7 +101,7 @@ static void fix_uid (char *uid)
       else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
         memcpy (uid, buf, n);
     }
-    mem_free (&buf);
+    p_delete(&buf);
     iconv_close (cd);
   }
 }