#include <time.h>
#include <ctype.h>
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
char *ob;
size_t ibl, obl;
- buf = mem_malloc (n + 1);
+ buf = p_new(char, n + 1);
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
- iconv (cd, &ib, &ibl, &ob, &obl);
+ my_iconv(cd, &ib, &ibl, &ob, &obl);
if (!ibl) {
if (ob - buf < n) {
memcpy (uid, buf, ob - buf);
else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
memcpy (uid, buf, n);
}
- mem_free (&buf);
+ p_delete(&buf);
iconv_close (cd);
}
}
return NULL;
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
- k = mem_calloc (sizeof *k, 1);
+ k = pgp_new_keyinfo();
break;
}
debug_print (2, ("user ID: %s\n", p));
- uid = mem_calloc (sizeof (pgp_uid_t), 1);
+ uid = p_new(pgp_uid_t, 1);
fix_uid (p);
uid->addr = str_dup (p);
uid->trust = trust;