#include <unistd.h>
#include <time.h>
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "lib.h"
#include "pgplib.h"
for (sp = *sigp; sp; sp = q) {
q = sp->next;
- FREE (&sp);
+ p_delete(&sp);
}
*sigp = NULL;
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;
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;
}
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)