From: Alain Bench <messtic@oreka.com>

[apps/madmutt.git] / score.c

diff --git a/score.c b/score.c
index 227e7fa..4bc13e6 100644 (file)
--- a/score.c
+++ b/score.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #if HAVE_CONFIG_H
@@ -22,6 +13,11 @@
 
 #include "mutt.h"
 #include "sort.h"
+#include "buffer.h"
+
+#include "lib/mem.h"
+#include "lib/intl.h"
+
 #include <string.h>
 #include <stdlib.h>
 
@@ -75,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);
   }
@@ -83,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)
-    if (mutt_strcmp (pattern, ptr->str) == 0)
+    if (str_cmp (pattern, ptr->str) == 0)
       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,24 +136,24 @@ int mutt_parse_unscore (BUFFER * buf, BUFFER * s, unsigned long data,
 
   while (MoreArgs (s)) {
     mutt_extract_token (buf, s, 0);
-    if (!mutt_strcmp ("*", buf->data)) {
+    if (!str_cmp ("*", buf->data)) {
       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) {
-        if (!mutt_strcmp (buf->data, tmp->str)) {
+        if (!str_cmp (buf->data, tmp->str)) {
           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;
         }