projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move ascii.* into the lib-lib.
[apps/madmutt.git]
/
pgppubring.c
diff --git
a/pgppubring.c
b/pgppubring.c
index
9f2ee46
..
e797e9a
100644
(file)
--- a/
pgppubring.c
+++ b/
pgppubring.c
@@
-27,9
+27,7
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
-
-#include "lib/mem.h"
-#include "lib/str.h"
+#include <lib-lib/str.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-248,7
+246,7
@@
static pgp_key_t pgp_parse_pgp2_key (unsigned char *buff, size_t l)
"%08lX", id);
}
"%08lX", id);
}
- p->keyid =
str_dup
((char *) scratch);
+ p->keyid =
m_strdup
((char *) scratch);
return p;
return p;
@@
-350,7
+348,7
@@
static pgp_key_t pgp_parse_pgp3_key (unsigned char *buff, size_t l)
id);
}
id);
}
- p->keyid =
str_dup
((char *) scratch);
+ p->keyid =
m_strdup
((char *) scratch);
return p;
}
return p;
}
@@
-638,7
+636,7
@@
static pgp_key_t pgp_parse_keyblock (FILE * fp)
case PT_SIG:
{
if (lsig) {
case PT_SIG:
{
if (lsig) {
- pgp_sig_t *signature =
mem_calloc (sizeof (pgp_sig_t)
, 1);
+ pgp_sig_t *signature =
p_new(pgp_sig_t
, 1);
*lsig = signature;
lsig = &signature->next;
*lsig = signature;
lsig = &signature->next;
@@
-671,7
+669,7
@@
static pgp_key_t pgp_parse_keyblock (FILE * fp)
chr = p_dupstr(buff + 1, l - 1);
chr = p_dupstr(buff + 1, l - 1);
- *addr = uid =
mem_calloc (1, sizeof (pgp_uid_t)
); /* XXX */
+ *addr = uid =
p_new(pgp_uid_t, 1
); /* XXX */
uid->addr = chr;
uid->parent = p;
uid->trust = 0;
uid->addr = chr;
uid->parent = p;
uid->trust = 0;
@@
-742,7
+740,7
@@
static void pgpring_find_candidates (char *ringfile, const char *hints[],
char *error_buf;
size_t error_buf_len;
char *error_buf;
size_t error_buf_len;
- error_buf_len = sizeof ("fopen: ") - 1 +
str_len
(ringfile) + 1;
+ error_buf_len = sizeof ("fopen: ") - 1 +
m_strlen
(ringfile) + 1;
error_buf = p_new(char, error_buf_len);
snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
perror (error_buf);
error_buf = p_new(char, error_buf_len);
snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
perror (error_buf);