even better and simpler parser.

[apps/madmutt.git] / pgplib.c

diff --git a/pgplib.c b/pgplib.c
index 364f1a9..d9e5ff9 100644 (file)
--- a/pgplib.c
+++ b/pgplib.c
@@ -25,8 +25,6 @@
 #include "lib.h"
 #include "pgplib.h"
 
-#include "lib/mem.h"
-
 const char *pgp_pkalgbytype (unsigned char type)
 {
   switch (type) {
@@ -146,10 +144,10 @@ pgp_uid_t *pgp_copy_uids (pgp_uid_t * up, pgp_key_t parent)
   pgp_uid_t **lp = &l;
 
   for (; up; up = up->next) {
-    *lp = mem_calloc (1, sizeof (pgp_uid_t));
+    *lp = p_new(pgp_uid_t, 1);
     (*lp)->trust = up->trust;
     (*lp)->flags = up->flags;
-    (*lp)->addr = str_dup (up->addr);
+    (*lp)->addr = m_strdup(up->addr);
     (*lp)->parent = parent;
     lp = &(*lp)->next;
   }