projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
license statements.
[apps/madmutt.git]
/
color.c
diff --git
a/color.c
b/color.c
index
ffc04db
..
ab2a500
100644
(file)
--- a/
color.c
+++ b/
color.c
@@
-12,16
+12,15
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "mutt.h"
#include "buffer.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mapping.h"
#include "mutt_curses.h"
#include "mapping.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
#include "lib/debug.h"
#include <string.h>
@@
-100,7
+99,7
@@
static struct mapping_t Fields[] = {
static COLOR_LINE *mutt_new_color_line (void)
{
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;
p->fg = p->bg = -1;
@@
-511,7
+510,7
@@
add_pattern (COLOR_LINE ** top, const char *s, int sensitive,
return (-1);
}
tmp->next = *top;
return (-1);
}
tmp->next = *top;
- tmp->pattern =
str_dup
(s);
+ tmp->pattern =
m_strdup
(s);
#ifdef HAVE_COLOR
if (fg != -1 && bg != -1) {
tmp->fg = fg;
#ifdef HAVE_COLOR
if (fg != -1 && bg != -1) {
tmp->fg = fg;
@@
-702,7
+701,7
@@
_mutt_parse_color (BUFFER * buf, BUFFER * s, BUFFER * err,
}
else if (object == MT_COLOR_QUOTED) {
if (q_level >= ColorQuoteSize) {
}
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];
}
ColorQuote[ColorQuoteSize - 2] = ColorDefs[MT_COLOR_QUOTED];
ColorQuote[ColorQuoteSize - 1] = ColorDefs[MT_COLOR_QUOTED];
}