#include <sys/wait.h>
#include <sys/stat.h>
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "recvattach.h"
#include "attach.h"
#include "lib.h"
-#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
stte->line_used += stte->buff_used;
if (stte->line_used > stte->line_max) {
stte->line_max = stte->line_used;
- mem_realloc (&stte->line, stte->line_max + 1);
+ p_realloc(&stte->line, stte->line_max + 1);
}
strcat (stte->line, stte->buffer); /* __STRCAT_CHECKED__ */
stte->line_len += stte->word_len;
if (stte->tag_level[RICH_PARAM]) {
if (stte->tag_level[RICH_COLOR]) {
if (stte->param_used + 1 >= stte->param_len)
- mem_realloc (&stte->param, (stte->param_len += STRING));
+ p_realloc(&stte->param, (stte->param_len += STRING));
stte->param[stte->param_used++] = c;
}
/* see if more space is needed (plus extra for possible rich characters) */
if (stte->buff_len < stte->buff_used + 3) {
stte->buff_len += LONG_STRING;
- mem_realloc (&stte->buffer, stte->buff_len + 1);
+ p_realloc(&stte->buffer, stte->buff_len + 1);
}
if ((!stte->tag_level[RICH_NOFILL] && ISSPACE (c)) || c == '\0') {
if (stte->buff_len < stte->buff_used + str_len (s)) {
stte->buff_len += LONG_STRING;
- mem_realloc (&stte->buffer, stte->buff_len + 1);
+ p_realloc(&stte->buffer, stte->buff_len + 1);
}
p = s;
((s->flags & M_DISPLAY) ? (COLS - 4) : ((COLS - 4) <
72) ? (COLS - 4) : 72);
stte.line_max = stte.WrapMargin * 4;
- stte.line = (char *) mem_calloc (1, stte.line_max + 1);
- stte.param = (char *) mem_calloc (1, STRING);
+ stte.line = p_new(char, stte.line_max + 1);
+ stte.param = p_new(char, STRING);
stte.param_len = STRING;
stte.param_used = 0;
state_putc ('\n', s); /* add a final newline */
- mem_free (&(stte.buffer));
- mem_free (&(stte.line));
- mem_free (&(stte.param));
+ p_delete(&(stte.buffer));
+ p_delete(&(stte.line));
+ p_delete(&(stte.param));
return (0);
}
mutt_sanitize_filename (fname, 1);
rfc1524_expand_filename (entry->nametemplate, fname, tempfile,
sizeof (tempfile));
- mem_free (&fname);
+ p_delete(&fname);
if (entry->command) {
strfcpy (command, entry->command, sizeof (command));