* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "sort.h"
-
-#include <string.h>
-#include <stdlib.h>
+#include "pattern.h"
typedef struct score_t {
char *str;
int val;
int exact; /* if this rule matches, don't evaluate any more */
struct score_t *next;
-} SCORE;
+} score_t;
+DO_INIT(score_t, score);
+static void score_wipe(score_t *sc)
+{
+ pattern_list_wipe(&sc->pat);
+ p_delete(&sc->str);
+}
+DO_NEW(score_t, score);
+DO_DELETE(score_t, score);
+DO_SLIST(score_t, score, score_delete);
-SCORE *Score = NULL;
+static score_t *Score = NULL;
void mutt_check_rescore (CONTEXT * ctx)
{
unset_option (OPTNEEDRESCORE);
}
-int mutt_parse_score (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_score (BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
BUFFER * err)
{
- SCORE *ptr, *last;
char *pattern, *pc;
struct pattern_t *pat;
+ score_t **last;
mutt_extract_token (buf, s, 0);
if (!MoreArgs (s)) {
/* 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 (m_strcmp(pattern, ptr->str) == 0)
+ for (last = &Score; *last; last = &(*last)->next) {
+ if (m_strcmp(pattern, (*last)->str) == 0)
break;
- if (!ptr) {
- if ((pat = mutt_pattern_comp (pattern, 0, err)) == NULL) {
+ }
+ if (!*last) {
+ if (!(pat = mutt_pattern_comp(pattern, 0, err))) {
p_delete(&pattern);
return (-1);
}
- ptr = p_new(SCORE, 1);
- if (last)
- last->next = ptr;
- else
- Score = ptr;
- ptr->pat = pat;
- ptr->str = pattern;
+ *last = score_new();
+ (*last)->pat = pat;
+ (*last)->str = pattern;
}
pc = buf->data;
- if (*pc == '=') {
- ptr->exact = 1;
- pc++;
- }
- ptr->val = atoi (pc);
- set_option (OPTNEEDRESCORE);
+ pc += (*last)->exact = (*pc == '=');
+ (*last)->val = atoi(pc);
+ set_option(OPTNEEDRESCORE);
return 0;
}
void mutt_score_message (CONTEXT * ctx, HEADER * hdr, int upd_ctx)
{
- SCORE *tmp;
+ score_t *tmp;
hdr->score = 0; /* in case of re-scoring */
for (tmp = Score; tmp; tmp = tmp->next) {
_mutt_set_flag (ctx, hdr, M_FLAG, 1, upd_ctx);
}
-int mutt_parse_unscore (BUFFER * buf, BUFFER * s, unsigned long data,
- BUFFER * err)
+int mutt_parse_unscore(BUFFER * buf, BUFFER * s,
+ unsigned long data __attribute__ ((unused)),
+ BUFFER * err __attribute__ ((unused)))
{
- SCORE *tmp, *last = NULL;
-
- while (MoreArgs (s)) {
- mutt_extract_token (buf, s, 0);
- if (!m_strcmp("*", buf->data)) {
- for (tmp = Score; tmp;) {
- last = tmp;
- tmp = tmp->next;
- mutt_pattern_free (&last->pat);
- p_delete(&last);
- }
- Score = NULL;
- }
- else {
- for (tmp = Score; tmp; last = tmp, tmp = tmp->next) {
- if (!m_strcmp(buf->data, tmp->str)) {
- if (last)
- last->next = tmp->next;
- else
- Score = tmp->next;
- mutt_pattern_free (&tmp->pat);
- p_delete(&tmp);
- /* there should only be one score per pattern, so we can stop here */
- break;
+ while (MoreArgs(s)) {
+ mutt_extract_token(buf, s, 0);
+ if (!m_strcmp("*", buf->data)) {
+ score_list_wipe(&Score);
+ } else {
+ score_t **last;
+
+ for (last = &Score; *last; last = &(*last)->next) {
+ if (!m_strcmp(buf->data, (*last)->str)) {
+ score_t *tmp = score_list_pop(last);
+ score_delete(&tmp);
+ break;
+ }
+ }
}
- }
}
- }
- set_option (OPTNEEDRESCORE);
- return 0;
+ set_option (OPTNEEDRESCORE);
+ return 0;
}