projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
color.c
diff --git
a/color.c
b/color.c
index
51d2f83
..
5484bba
100644
(file)
--- a/
color.c
+++ b/
color.c
@@
-12,6
+12,8
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "buffer.h"
+#include "ascii.h"
#include "mutt_curses.h"
#include "mapping.h"
#include "mutt_curses.h"
#include "mapping.h"
@@
-96,7
+98,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 =
safe
_calloc (1, sizeof (COLOR_LINE));
+ COLOR_LINE *p =
mem
_calloc (1, sizeof (COLOR_LINE));
p->fg = p->bg = -1;
p->fg = p->bg = -1;
@@
-123,14
+125,14
@@
static void mutt_free_color_line (COLOR_LINE ** l, int free_colors)
regfree (&tmp->rx);
mutt_pattern_free (&tmp->color_pattern);
regfree (&tmp->rx);
mutt_pattern_free (&tmp->color_pattern);
-
FREE
(&tmp->pattern);
-
FREE
(l);
+
mem_free
(&tmp->pattern);
+
mem_free
(l);
}
void ci_start_color (void)
{
memset (ColorDefs, A_NORMAL, sizeof (int) * MT_COLOR_MAX);
}
void ci_start_color (void)
{
memset (ColorDefs, A_NORMAL, sizeof (int) * MT_COLOR_MAX);
- ColorQuote = (int *)
safe
_malloc (COLOR_QUOTE_INIT * sizeof (int));
+ ColorQuote = (int *)
mem
_malloc (COLOR_QUOTE_INIT * sizeof (int));
memset (ColorQuote, A_NORMAL, sizeof (int) * COLOR_QUOTE_INIT);
ColorQuoteSize = COLOR_QUOTE_INIT;
ColorQuoteUsed = 0;
memset (ColorQuote, A_NORMAL, sizeof (int) * COLOR_QUOTE_INIT);
ColorQuoteSize = COLOR_QUOTE_INIT;
ColorQuoteUsed = 0;
@@
-223,7
+225,7
@@
int mutt_alloc_color (int fg, int bg)
i++;
}
i++;
}
- p = (COLOR_LIST *)
safe
_malloc (sizeof (COLOR_LIST));
+ p = (COLOR_LIST *)
mem
_malloc (sizeof (COLOR_LIST));
p->next = ColorList;
ColorList = p;
p->next = ColorList;
ColorList = p;
@@
-267,14
+269,14
@@
void mutt_free_color (int fg, int bg)
if (p == ColorList) {
ColorList = ColorList->next;
if (p == ColorList) {
ColorList = ColorList->next;
-
FREE
(&p);
+
mem_free
(&p);
return;
}
q = ColorList;
while (q) {
if (q->next == p) {
q->next = p->next;
return;
}
q = ColorList;
while (q) {
if (q->next == p) {
q->next = p->next;
-
FREE
(&p);
+
mem_free
(&p);
return;
}
q = q->next;
return;
}
q = q->next;
@@
-698,7
+700,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) {
-
safe
_realloc (&ColorQuote, (ColorQuoteSize += 2) * sizeof (int));
+
mem
_realloc (&ColorQuote, (ColorQuoteSize += 2) * sizeof (int));
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];
}