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

diff --git a/pgppubring.c b/pgppubring.c
index 9f2ee46..e797e9a 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -27,9 +27,7 @@
 #endif
 
 #include <lib-lib/mem.h>
-
-#include "lib/mem.h"
-#include "lib/str.h"
+#include <lib-lib/str.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -248,7 +246,7 @@ 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;
 
@@ -350,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;
 }
@@ -638,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;
@@ -671,7 +669,7 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp)
 
         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;
@@ -742,7 +740,7 @@ 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_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);