X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=e797e9a0e3be3ed09dd5423899187a85d1bf2bc4;hp=88b11e42392ab85780a87d958b294e364fb49d2e;hb=ecaab35b973fbceb58b5ed174971c82762cc0199;hpb=ef7b80006ebb47372d69c64e8b2b2f0764333d55

diff --git a/pgppubring.c b/pgppubring.c
index 88b11e4..e797e9a 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -26,8 +26,8 @@
 # include "config.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/str.h"
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,13 +36,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"
@@ -246,13 +246,13 @@ static pgp_key_t pgp_parse_pgp2_key (unsigned char *buff, size_t l)
               "%08lX", id);
   }
 
-  p->keyid = str_dup ((char *) scratch);
+  p->keyid = m_strdup((char *) scratch);
 
   return p;
 
 bailout:
 
-  mem_free (&p);
+  p_delete(&p);
   return NULL;
 }
 
@@ -348,7 +348,7 @@ static pgp_key_t pgp_parse_pgp3_key (unsigned char *buff, size_t l)
               id);
   }
 
-  p->keyid = str_dup ((char *) scratch);
+  p->keyid = m_strdup((char *) scratch);
 
   return p;
 }
@@ -636,7 +636,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 +667,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;
@@ -743,11 +740,11 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
     char *error_buf;
     size_t error_buf_len;
 
-    error_buf_len = sizeof ("fopen: ") - 1 + str_len (ringfile) + 1;
-    error_buf = mem_malloc (error_buf_len);
+    error_buf_len = sizeof ("fopen: ") - 1 + m_strlen(ringfile) + 1;
+    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 +761,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 +779,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
         pgp_free_key (&p);
       }
 
-      mem_free (&tmp);
+      p_delete(&tmp);
     }
 
     FGETPOS (rfp, pos);