X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pgplib.c;h=f0ffda8a6d383cd4363e679138ce815a4b69f85c;hb=23002a877577341cfd68687e58348e0ca01b1ac5;hp=c3e5af1cc9456b381cf512532d53f031aeb5c534;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d;p=apps%2Fmadmutt.git

diff --git a/pgplib.c b/pgplib.c
index c3e5af1..f0ffda8 100644
--- a/pgplib.c
+++ b/pgplib.c
@@ -19,6 +19,8 @@
 #include <unistd.h>
 #include <time.h>
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "lib.h"
 #include "pgplib.h"
@@ -116,7 +118,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 +133,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,7 +146,7 @@ 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 = str_dup (up->addr);
@@ -165,8 +167,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)