move buffer.[hc] into lib-lib/

[apps/madmutt.git] / score.c

diff --git a/score.c b/score.c
index 071b0fa..7d04fb4 100644 (file)
--- a/score.c
+++ b/score.c
@@ -12,13 +12,11 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
 
 #include "mutt.h"
 #include "sort.h"
-#include "buffer.h"
-
-#include "lib/mem.h"
-#include "lib/intl.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -70,7 +68,7 @@ int mutt_parse_score (BUFFER * buf, BUFFER * s, unsigned long data,
     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);
@@ -88,7 +86,7 @@ int mutt_parse_score (BUFFER * buf, BUFFER * s, unsigned long data,
       p_delete(&pattern);
       return (-1);
     }
-    ptr = mem_calloc (1, sizeof (SCORE));
+    ptr = p_new(SCORE, 1);
     if (last)
       last->next = ptr;
     else