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]
/
score.c
diff --git
a/score.c
b/score.c
index
40dbd46
..
5d401dc
100644
(file)
--- a/
score.c
+++ b/
score.c
@@
-13,6
+13,7
@@
#include "mutt.h"
#include "sort.h"
#include "mutt.h"
#include "sort.h"
+#include "buffer.h"
#include "lib/mem.h"
#include "lib/intl.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)) {
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);
}
strfcpy (err->data, _("score: too many arguments"), err->dsize);
return (-1);
}
@@
-78,14
+79,14
@@
int mutt_parse_score (BUFFER * buf, BUFFER * s, unsigned long data,
/* look for an existing entry and update the value, else add it to the end
of the list */
for (ptr = Score, last = NULL; ptr; last = ptr, ptr = ptr->next)
/* look for an existing entry and update the value, else add it to the end
of the list */
for (ptr = Score, last = NULL; ptr; last = ptr, ptr = ptr->next)
- if (s
afe_str
cmp (pattern, ptr->str) == 0)
+ if (s
tr_
cmp (pattern, ptr->str) == 0)
break;
if (!ptr) {
if ((pat = mutt_pattern_comp (pattern, 0, err)) == NULL) {
break;
if (!ptr) {
if ((pat = mutt_pattern_comp (pattern, 0, err)) == NULL) {
-
FREE
(&pattern);
+
mem_free
(&pattern);
return (-1);
}
return (-1);
}
- ptr =
safe
_calloc (1, sizeof (SCORE));
+ ptr =
mem
_calloc (1, sizeof (SCORE));
if (last)
last->next = ptr;
else
if (last)
last->next = ptr;
else
@@
-109,7
+110,7
@@
void mutt_score_message (CONTEXT * ctx, HEADER * hdr, int upd_ctx)
hdr->score = 0; /* in case of re-scoring */
for (tmp = Score; tmp; tmp = tmp->next) {
hdr->score = 0; /* in case of re-scoring */
for (tmp = Score; tmp; tmp = tmp->next) {
- if (mutt_pattern_exec (tmp->pat,
0
, NULL, hdr) > 0) {
+ if (mutt_pattern_exec (tmp->pat,
M_MATCH_FULL_ADDRESS
, NULL, hdr) > 0) {
if (tmp->exact || tmp->val == 9999 || tmp->val == -9999) {
hdr->score = tmp->val;
break;
if (tmp->exact || tmp->val == 9999 || tmp->val == -9999) {
hdr->score = tmp->val;
break;
@@
-135,24
+136,24
@@
int mutt_parse_unscore (BUFFER * buf, BUFFER * s, unsigned long data,
while (MoreArgs (s)) {
mutt_extract_token (buf, s, 0);
while (MoreArgs (s)) {
mutt_extract_token (buf, s, 0);
- if (!s
afe_str
cmp ("*", buf->data)) {
+ if (!s
tr_
cmp ("*", buf->data)) {
for (tmp = Score; tmp;) {
last = tmp;
tmp = tmp->next;
mutt_pattern_free (&last->pat);
for (tmp = Score; tmp;) {
last = tmp;
tmp = tmp->next;
mutt_pattern_free (&last->pat);
-
FREE
(&last);
+
mem_free
(&last);
}
Score = NULL;
}
else {
for (tmp = Score; tmp; last = tmp, tmp = tmp->next) {
}
Score = NULL;
}
else {
for (tmp = Score; tmp; last = tmp, tmp = tmp->next) {
- if (!s
afe_str
cmp (buf->data, tmp->str)) {
+ if (!s
tr_
cmp (buf->data, tmp->str)) {
if (last)
last->next = tmp->next;
else
Score = tmp->next;
mutt_pattern_free (&tmp->pat);
if (last)
last->next = tmp->next;
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;
}
/* there should only be one score per pattern, so we can stop here */
break;
}