#include "lib.h"
#include "pgplib.h"
+#include "lib/mem.h"
+
const char *pgp_pkalgbytype (unsigned char type)
{
switch (type) {
for (sp = *sigp; sp; sp = q) {
q = sp->next;
- FREE (&sp);
+ mem_free (&sp);
}
*sigp = NULL;
for (up = *upp; up; up = q) {
q = up->next;
pgp_free_sig (&up->sigs);
- FREE (&up->addr);
- FREE (&up);
+ mem_free (&up->addr);
+ mem_free (&up);
}
*upp = NULL;
pgp_uid_t **lp = &l;
for (; up; up = up->next) {
- *lp = safe_calloc (1, sizeof (pgp_uid_t));
+ *lp = mem_calloc (1, sizeof (pgp_uid_t));
(*lp)->trust = up->trust;
(*lp)->flags = up->flags;
- (*lp)->addr = safe_strdup (up->addr);
+ (*lp)->addr = str_dup (up->addr);
(*lp)->parent = parent;
lp = &(*lp)->next;
}
kp = *kpp;
pgp_free_uid (&kp->address);
- FREE (&kp->keyid);
- FREE (kpp);
+ mem_free (&kp->keyid);
+ mem_free (kpp);
}
pgp_key_t pgp_remove_key (pgp_key_t * klist, pgp_key_t key)