# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
#include "mutt_curses.h"
#include "mapping.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
static COLOR_LINE *mutt_new_color_line (void)
{
- COLOR_LINE *p = mem_calloc (1, sizeof (COLOR_LINE));
+ COLOR_LINE *p = p_new(COLOR_LINE, 1);
p->fg = p->bg = -1;
regfree (&tmp->rx);
mutt_pattern_free (&tmp->color_pattern);
- mem_free (&tmp->pattern);
- mem_free (l);
+ p_delete(&tmp->pattern);
+ p_delete(l);
}
void ci_start_color (void)
{
memset (ColorDefs, A_NORMAL, sizeof (int) * MT_COLOR_MAX);
- ColorQuote = (int *) mem_malloc (COLOR_QUOTE_INIT * sizeof (int));
+ ColorQuote = p_new(int, COLOR_QUOTE_INIT);
memset (ColorQuote, A_NORMAL, sizeof (int) * COLOR_QUOTE_INIT);
ColorQuoteSize = COLOR_QUOTE_INIT;
ColorQuoteUsed = 0;
i++;
}
- p = (COLOR_LIST *) mem_malloc (sizeof (COLOR_LIST));
+ p = p_new(COLOR_LIST, 1);
p->next = ColorList;
ColorList = p;
if (p == ColorList) {
ColorList = ColorList->next;
- mem_free (&p);
+ p_delete(&p);
return;
}
q = ColorList;
while (q) {
if (q->next == p) {
q->next = p->next;
- mem_free (&p);
+ p_delete(&p);
return;
}
q = q->next;
}
else if (object == MT_COLOR_QUOTED) {
if (q_level >= ColorQuoteSize) {
- mem_realloc (&ColorQuote, (ColorQuoteSize += 2) * sizeof (int));
+ p_realloc(&ColorQuote, ColorQuoteSize += 2);
ColorQuote[ColorQuoteSize - 2] = ColorDefs[MT_COLOR_QUOTED];
ColorQuote[ColorQuoteSize - 1] = ColorDefs[MT_COLOR_QUOTED];
}