X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=score.c;h=6f58ba16d553e906124099155d8b29ff2005771c;hp=7fe90f6fb0843c67fae41d7c2e67c417f916436f;hb=9233c1f8fefc6ecfe015682f532a7f1ff5038143;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/score.c b/score.c
index 7fe90f6..6f58ba1 100644
--- a/score.c
+++ b/score.c
@@ -7,21 +7,11 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "sort.h"
-#include "buffer.h"
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-
-#include <string.h>
-#include <stdlib.h>
+#include "pattern.h"
 
 typedef struct score_t {
   char *str;
@@ -29,9 +19,20 @@ typedef struct score_t {
   int val;
   int exact;                    /* if this rule matches, don't evaluate any more */
   struct score_t *next;
-} SCORE;
+} score_t;
+
+score_t *Score = NULL;
+
+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);
 
-SCORE *Score = NULL;
+DO_SLIST(score_t, score, score_delete);
 
 void mutt_check_rescore (CONTEXT * ctx)
 {
@@ -57,58 +58,56 @@ 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)) {
-    strfcpy (err->data, _("score: too few arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("score: too few arguments"));
     return (-1);
   }
   pattern = buf->data;
-  memset (buf, 0, sizeof (BUFFER));
+  p_clear(buf, 1);
   mutt_extract_token (buf, s, 0);
   if (MoreArgs (s)) {
     p_delete(&pattern);
-    strfcpy (err->data, _("score: too many arguments"), err->dsize);
+    m_strcpy(err->data, err->dsize, _("score: too many arguments"));
     return (-1);
   }
 
   /* 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 (str_cmp (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;
+    (*last)->exact = 1;
     pc++;
   }
-  ptr->val = atoi (pc);
-  set_option (OPTNEEDRESCORE);
+  (*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) {
@@ -131,37 +130,26 @@ void mutt_score_message (CONTEXT * ctx, HEADER * hdr, int upd_ctx)
     _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 (!str_cmp ("*", 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 (!str_cmp (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;
 }