X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=score.c;h=4bc13e62523d6173c7bae7cf24c08ca09f223732;hp=1c442ecb1b7e8f7b2faff8a8a12b9411f4d64432;hb=189d7d65c27f269b7d85473483488cc6ebbf12f5;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d diff --git a/score.c b/score.c index 1c442ec..4bc13e6 100644 --- a/score.c +++ b/score.c @@ -13,6 +13,7 @@ #include "mutt.h" #include "sort.h" +#include "buffer.h" #include "lib/mem.h" #include "lib/intl.h" @@ -70,7 +71,7 @@ int mutt_parse_score (BUFFER * buf, BUFFER * s, unsigned long data, memset (buf, 0, sizeof (BUFFER)); mutt_extract_token (buf, s, 0); if (MoreArgs (s)) { - FREE (&pattern); + mem_free (&pattern); strfcpy (err->data, _("score: too many arguments"), err->dsize); return (-1); } @@ -82,10 +83,10 @@ int mutt_parse_score (BUFFER * buf, BUFFER * s, unsigned long data, break; if (!ptr) { if ((pat = mutt_pattern_comp (pattern, 0, err)) == NULL) { - FREE (&pattern); + mem_free (&pattern); return (-1); } - ptr = safe_calloc (1, sizeof (SCORE)); + ptr = mem_calloc (1, sizeof (SCORE)); if (last) last->next = ptr; else @@ -140,7 +141,7 @@ int mutt_parse_unscore (BUFFER * buf, BUFFER * s, unsigned long data, last = tmp; tmp = tmp->next; mutt_pattern_free (&last->pat); - FREE (&last); + mem_free (&last); } Score = NULL; } @@ -152,7 +153,7 @@ int mutt_parse_unscore (BUFFER * buf, BUFFER * s, unsigned long data, else Score = tmp->next; mutt_pattern_free (&tmp->pat); - FREE (&tmp); + mem_free (&tmp); /* there should only be one score per pattern, so we can stop here */ break; }