X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=score.c;h=f782391650ae0674340e91924efa04f65f1055a0;hp=1c442ecb1b7e8f7b2faff8a8a12b9411f4d64432;hb=916e4872caf252a5850e64f79427b9dd7808435d;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d

diff --git a/score.c b/score.c
index 1c442ec..f782391 100644
--- a/score.c
+++ b/score.c
@@ -7,19 +7,11 @@
  * 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 "lib/mem.h"
-#include "lib/intl.h"
-
-#include <string.h>
-#include <stdlib.h>
-
 typedef struct score_t {
   char *str;
   pattern_t *pat;
@@ -63,29 +55,29 @@ int mutt_parse_score (BUFFER * buf, BUFFER * s, unsigned long data,
 
   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)) {
-    FREE (&pattern);
-    strfcpy (err->data, _("score: too many arguments"), err->dsize);
+    p_delete(&pattern);
+    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)
+    if (m_strcmp(pattern, ptr->str) == 0)
       break;
   if (!ptr) {
     if ((pat = mutt_pattern_comp (pattern, 0, err)) == NULL) {
-      FREE (&pattern);
+      p_delete(&pattern);
       return (-1);
     }
-    ptr = safe_calloc (1, sizeof (SCORE));
+    ptr = p_new(SCORE, 1);
     if (last)
       last->next = ptr;
     else
@@ -109,7 +101,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) {
-    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;
@@ -135,24 +127,24 @@ int mutt_parse_unscore (BUFFER * buf, BUFFER * s, unsigned long data,
 
   while (MoreArgs (s)) {
     mutt_extract_token (buf, s, 0);
-    if (!str_cmp ("*", buf->data)) {
+    if (!m_strcmp("*", buf->data)) {
       for (tmp = Score; tmp;) {
         last = tmp;
         tmp = tmp->next;
         mutt_pattern_free (&last->pat);
-        FREE (&last);
+        p_delete(&last);
       }
       Score = NULL;
     }
     else {
       for (tmp = Score; tmp; last = tmp, tmp = tmp->next) {
-        if (!str_cmp (buf->data, tmp->str)) {
+        if (!m_strcmp(buf->data, tmp->str)) {
           if (last)
             last->next = tmp->next;
           else
             Score = tmp->next;
           mutt_pattern_free (&tmp->pat);
-          FREE (&tmp);
+          p_delete(&tmp);
           /* there should only be one score per pattern, so we can stop here */
           break;
         }