# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_menu.h"
* Replace part of the wchar_t buffer, from FROM to CURPOS, by BUF.
*/
-static void replace_part (ENTER_STATE * state, size_t from, char *buf)
+static void replace_part (ENTER_STATE *state, size_t from, const char *buf)
{
/* 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));
memcpy (state->wbuf + state->curpos, savebuf, savelen * sizeof (wchar_t));
state->lastchar = state->curpos + savelen;
- mem_free (&savebuf);
+ p_delete(&savebuf);
}
/*
switch (ch) {
case OP_EDITOR_HISTORY_UP:
state->curpos = state->lastchar;
- replace_part (state, 0, mutt_history_prev (hclass));
+ replace_part(state, 0, mutt_history_prev(hclass));
redraw = M_REDRAW_INIT;
break;
case OP_EDITOR_HISTORY_DOWN:
state->curpos = state->lastchar;
- replace_part (state, 0, mutt_history_next (hclass));
+ replace_part(state, 0, mutt_history_next(hclass));
redraw = M_REDRAW_INIT;
break;
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;
bye:
- mem_free (&tempbuf);
+ p_delete(&tempbuf);
return rv;
}
if (!esp)
return;
- mem_free (&(*esp)->wbuf);
- mem_free (esp);
+ p_delete(&(*esp)->wbuf);
+ p_delete(esp);
}
/*