char *ob;
size_t ibl, obl;
- buf = safe_malloc (n + 1);
+ buf = mem_malloc (n + 1);
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
iconv (cd, &ib, &ibl, &ob, &obl);
if (!ibl) {
memcpy (uid, buf, ob - buf);
uid[ob - buf] = '\0';
}
- else if (ob - buf == n && (buf[n] = 0, safe_strlen (buf) < n))
+ else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
memcpy (uid, buf, n);
}
- FREE (&buf);
+ mem_free (&buf);
iconv_close (cd);
}
}
{
debug_print (2, ("record type: %s\n", p));
- if (!safe_strcmp (p, "pub"));
- else if (!safe_strcmp (p, "sub"))
+ if (!str_cmp (p, "pub"));
+ else if (!str_cmp (p, "sub"))
*is_subkey = 1;
- else if (!safe_strcmp (p, "sec"));
- else if (!safe_strcmp (p, "ssb"))
+ else if (!str_cmp (p, "sec"));
+ else if (!str_cmp (p, "ssb"))
*is_subkey = 1;
- else if (!safe_strcmp (p, "uid"))
+ else if (!str_cmp (p, "uid"))
is_uid = 1;
else
return NULL;
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
- k = safe_calloc (sizeof *k, 1);
+ k = mem_calloc (sizeof *k, 1);
break;
}
debug_print (2, ("user ID: %s\n", p));
- uid = safe_calloc (sizeof (pgp_uid_t), 1);
+ uid = mem_calloc (sizeof (pgp_uid_t), 1);
fix_uid (p);
- uid->addr = safe_strdup (p);
+ uid->addr = str_dup (p);
uid->trust = trust;
uid->flags |= flags;
uid->parent = k;