X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=0ab6a53b0e5f8d0c5a3e5e0a54a9bf71b8ad78e1;hp=5d97aa6174df642fe2a50f0ded5a7661e5c61bdc;hb=9114fccb27d817ba18918a84524e6e8b1998f361;hpb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372

diff --git a/pgppubring.c b/pgppubring.c
index 5d97aa6..0ab6a53 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -26,7 +26,8 @@
 # include "config.h"
 #endif
 
-#include "lib/mem.h"
+#include <lib-lib/mem.h>
+
 #include "lib/str.h"
 
 #include <stdio.h>
@@ -36,13 +37,13 @@
 #include <time.h>
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
-#endif
-#include <errno.h>
-
+#else
 extern char *optarg;
 extern int optind;
+#endif
+#include <errno.h>
 
-short Umask;                    /* dirty hack because we need Umask in lib.c but don't want globals.h there */
+short Umask;   /* dirty hack because we need Umask in lib.c but don't want globals.h there */
 
 #include "sha1.h"
 #include "md5.h"
@@ -252,7 +253,7 @@ static pgp_key_t pgp_parse_pgp2_key (unsigned char *buff, size_t l)
 
 bailout:
 
-  mem_free (&p);
+  p_delete(&p);
   return NULL;
 }
 
@@ -579,7 +580,7 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp)
 #ifdef HAVE_FGETPOS
   fpos_t pos;
 #else
-  LOFF_T pos;
+  off_t pos;
 #endif
 
   pgp_key_t root = NULL;
@@ -636,7 +637,7 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp)
     case PT_SIG:
       {
         if (lsig) {
-          pgp_sig_t *signature = mem_calloc (sizeof (pgp_sig_t), 1);
+          pgp_sig_t *signature = p_new(pgp_sig_t, 1);
 
           *lsig = signature;
           lsig = &signature->next;
@@ -667,12 +668,9 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp)
         if (!addr)
           break;
 
-        chr = mem_malloc (l);
-        memcpy (chr, buff + 1, l - 1);
-        chr[l - 1] = '\0';
+        chr = p_dupstr(buff + 1, l - 1);
 
-
-        *addr = uid = mem_calloc (1, sizeof (pgp_uid_t));      /* XXX */
+        *addr = uid = p_new(pgp_uid_t, 1);      /* XXX */
         uid->addr = chr;
         uid->parent = p;
         uid->trust = 0;
@@ -730,7 +728,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
 #ifdef HAVE_FGETPOS
   fpos_t pos, keypos;
 #else
-  LOFF_T pos, keypos;
+  off_t pos, keypos;
 #endif
 
   unsigned char *buff = NULL;
@@ -744,10 +742,10 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
     size_t error_buf_len;
 
     error_buf_len = sizeof ("fopen: ") - 1 + str_len (ringfile) + 1;
-    error_buf = mem_malloc (error_buf_len);
+    error_buf = p_new(char, error_buf_len);
     snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
     perror (error_buf);
-    mem_free (&error_buf);
+    p_delete(&error_buf);
     return;
   }
 
@@ -764,10 +762,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
       keypos = pos;
     }
     else if (pt == PT_NAME) {
-      char *tmp = mem_malloc (l);
-
-      memcpy (tmp, buff + 1, l - 1);
-      tmp[l - 1] = '\0';
+      char *tmp = p_dupstr(buff + 1, l - 1);
 
       /* mutt_decode_utf8_string (tmp, chs); */
 
@@ -785,7 +780,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
         pgp_free_key (&p);
       }
 
-      mem_free (&tmp);
+      p_delete(&tmp);
     }
 
     FGETPOS (rfp, pos);