#endif
#include "mutt.h"
+#include "ascii.h"
+#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
break;
bytes -= str_len (p);
if (*bufmax == *buflen)
- safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+ mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
buf[(*buflen)++] = str_dup (tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
- safe_realloc (&buf, sizeof (char *) * (++*bufmax));
+ mem_realloc (&buf, sizeof (char *) * (++*bufmax));
}
if (buf)
buf[*buflen] = NULL;
static void be_free_memory (char **buf, int buflen)
{
while (buflen-- > 0)
- FREE (&buf[buflen]);
+ mem_free (&buf[buflen]);
if (buf)
- FREE (&buf);
+ mem_free (&buf);
}
static char **be_include_messages (char *msg, char **buf, int *bufmax,
}
if (*bufmax == *buflen)
- safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+ mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
buf[(*buflen)++] = str_dup (tmp);
bytes = Context->hdrs[n]->content->length;
pfx);
if (*bufmax == *buflen)
- safe_realloc (&buf, sizeof (char *) * (*bufmax += 25));
+ mem_realloc (&buf, sizeof (char *) * (*bufmax += 25));
buf[(*buflen)++] = str_dup ("\n");
}
else
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
tmp[str_len (tmp) - 1] = 0;
- FREE (&buf[buflen]);
+ mem_free (&buf[buflen]);
buf[buflen] = NULL;
continue;
}
else {
str_cat (tmp, sizeof (tmp), "\n");
if (buflen == bufmax)
- safe_realloc (&buf, sizeof (char *) * (bufmax += 25));
+ mem_realloc (&buf, sizeof (char *) * (bufmax += 25));
buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp);
}