X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=score.c;h=ba00a3cdb7243fa12286621114bf1f3394590239;hp=24cad5910f00fffa66241625874e3f239e1f6671;hb=6ce74784b17c30f98db577d03b03e67d9885df47;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/score.c b/score.c
index 24cad59..ba00a3c 100644
--- a/score.c
+++ b/score.c
@@ -7,20 +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/macros.h>
-#include <lib-lib/buffer.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "sort.h"
 
-#include <string.h>
-#include <stdlib.h>
-
 typedef struct score_t {
   char *str;
   pattern_t *pat;
@@ -55,7 +46,8 @@ 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;
@@ -64,7 +56,7 @@ 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;
@@ -72,7 +64,7 @@ int mutt_parse_score (BUFFER * buf, BUFFER * s, unsigned long data,
   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);
   }
 
@@ -129,8 +121,9 @@ 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;