#include <ctype.h>
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include "mutt.h"
#include "pgp.h"
/* for hexval */
#include "mime.h"
-#include "lib/mem.h"
-#include "lib/str.h"
#include "lib/debug.h"
/****************
memcpy (uid, buf, ob - buf);
uid[ob - buf] = '\0';
}
- else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
+ else if (ob - buf == n && (buf[n] = 0, m_strlen(buf) < n))
memcpy (uid, buf, n);
}
p_delete(&buf);
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->addr = m_strdup(p);
uid->trust = trust;
uid->flags |= flags;
uid->parent = k;