X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgplib.c;h=d9e5ff9f53aae23aa9a5d34ae012cd7a6c9103a9;hp=d39f07676c41be9e20520fdfca75d4a40c4a92d3;hb=6c7e9f1a1008e4fedb1e0ae1e4ad7af17c8239df;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/pgplib.c b/pgplib.c
index d39f076..d9e5ff9 100644
--- a/pgplib.c
+++ b/pgplib.c
@@ -19,12 +19,12 @@
 #include <unistd.h>
 #include <time.h>
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "lib.h"
 #include "pgplib.h"
 
-#include "lib/mem.h"
-
 const char *pgp_pkalgbytype (unsigned char type)
 {
   switch (type) {
@@ -116,7 +116,7 @@ void pgp_free_sig (pgp_sig_t ** sigp)
 
   for (sp = *sigp; sp; sp = q) {
     q = sp->next;
-    FREE (&sp);
+    p_delete(&sp);
   }
 
   *sigp = NULL;
@@ -131,8 +131,8 @@ void pgp_free_uid (pgp_uid_t ** upp)
   for (up = *upp; up; up = q) {
     q = up->next;
     pgp_free_sig (&up->sigs);
-    FREE (&up->addr);
-    FREE (&up);
+    p_delete(&up->addr);
+    p_delete(&up);
   }
 
   *upp = NULL;
@@ -144,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 = safe_calloc (1, sizeof (pgp_uid_t));
+    *lp = p_new(pgp_uid_t, 1);
     (*lp)->trust = up->trust;
     (*lp)->flags = up->flags;
-    (*lp)->addr = safe_strdup (up->addr);
+    (*lp)->addr = m_strdup(up->addr);
     (*lp)->parent = parent;
     lp = &(*lp)->next;
   }
@@ -165,8 +165,8 @@ static void _pgp_free_key (pgp_key_t * kpp)
   kp = *kpp;
 
   pgp_free_uid (&kp->address);
-  FREE (&kp->keyid);
-  FREE (kpp);
+  p_delete(&kp->keyid);
+  p_delete(kpp);
 }
 
 pgp_key_t pgp_remove_key (pgp_key_t * klist, pgp_key_t key)