{
/* Save the suffix */
size_t savelen = state->lastchar - state->curpos;
- wchar_t *savebuf = mem_calloc (savelen, sizeof (wchar_t));
+ wchar_t *savebuf = p_new(wchar_t, savelen);
memcpy (savebuf, state->wbuf + state->curpos, savelen * sizeof (wchar_t));
char **tfiles;
*numfiles = 1;
- tfiles = mem_calloc (*numfiles, sizeof (char *));
+ tfiles = p_new(char *, *numfiles);
mutt_expand_path (buf, buflen);
tfiles[0] = str_dup (buf);
*files = tfiles;