projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Julien danjou: fix a couple of compilation warnings.
[apps/madmutt.git]
/
pgplib.c
diff --git
a/pgplib.c
b/pgplib.c
index
26b029b
..
d9e5ff9
100644
(file)
--- a/
pgplib.c
+++ b/
pgplib.c
@@
-19,12
+19,12
@@
#include <unistd.h>
#include <time.h>
#include <unistd.h>
#include <time.h>
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "lib.h"
#include "pgplib.h"
#include "mutt.h"
#include "lib.h"
#include "pgplib.h"
-#include "lib/mem.h"
-
const char *pgp_pkalgbytype (unsigned char type)
{
switch (type) {
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;
for (sp = *sigp; sp; sp = q) {
q = sp->next;
-
mem_free
(&sp);
+
p_delete
(&sp);
}
*sigp = NULL;
}
*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);
for (up = *upp; up; up = q) {
q = up->next;
pgp_free_sig (&up->sigs);
-
mem_free
(&up->addr);
-
mem_free
(&up);
+
p_delete
(&up->addr);
+
p_delete
(&up);
}
*upp = NULL;
}
*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) {
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)->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;
}
(*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);
kp = *kpp;
pgp_free_uid (&kp->address);
-
mem_free
(&kp->keyid);
-
mem_free
(kpp);
+
p_delete
(&kp->keyid);
+
p_delete
(kpp);
}
pgp_key_t pgp_remove_key (pgp_key_t * klist, pgp_key_t key)
}
pgp_key_t pgp_remove_key (pgp_key_t * klist, pgp_key_t key)