# include "config.h"
#endif
+#include "lib/mem.h"
+#include "lib/str.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
"%08lX", id);
}
- p->keyid = safe_strdup ((char *) scratch);
+ p->keyid = str_dup ((char *) scratch);
return p;
bailout:
- FREE (&p);
+ mem_free (&p);
return NULL;
}
id);
}
- p->keyid = safe_strdup ((char *) scratch);
+ p->keyid = str_dup ((char *) scratch);
return p;
}
case PT_SIG:
{
if (lsig) {
- pgp_sig_t *signature = safe_calloc (sizeof (pgp_sig_t), 1);
+ pgp_sig_t *signature = mem_calloc (sizeof (pgp_sig_t), 1);
*lsig = signature;
lsig = &signature->next;
if (!addr)
break;
- chr = safe_malloc (l);
+ chr = mem_malloc (l);
memcpy (chr, buff + 1, l - 1);
chr[l - 1] = '\0';
- *addr = uid = safe_calloc (1, sizeof (pgp_uid_t)); /* XXX */
+ *addr = uid = mem_calloc (1, sizeof (pgp_uid_t)); /* XXX */
uid->addr = chr;
uid->parent = p;
uid->trust = 0;
return 1;
for (i = 0; i < nhints; i++) {
- if (mutt_stristr (s, hints[i]) != NULL)
+ if (str_isstr (s, hints[i]) != NULL)
return 1;
}
char *error_buf;
size_t error_buf_len;
- error_buf_len = sizeof ("fopen: ") - 1 + strlen (ringfile) + 1;
- error_buf = safe_malloc (error_buf_len);
+ error_buf_len = sizeof ("fopen: ") - 1 + str_len (ringfile) + 1;
+ error_buf = mem_malloc (error_buf_len);
snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
perror (error_buf);
- FREE (&error_buf);
+ mem_free (&error_buf);
return;
}
keypos = pos;
}
else if (pt == PT_NAME) {
- char *tmp = safe_malloc (l);
+ char *tmp = mem_malloc (l);
memcpy (tmp, buff + 1, l - 1);
tmp[l - 1] = '\0';
pgp_free_key (&p);
}
- FREE (&tmp);
+ mem_free (&tmp);
}
FGETPOS (rfp, pos);