* 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 "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;
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;
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)) {
- mem_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) {
- mem_free (&pattern);
+ p_delete(&pattern);
return (-1);
}
- ptr = mem_calloc (1, sizeof (SCORE));
+ ptr = p_new(SCORE, 1);
if (last)
last->next = ptr;
else
_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)) {
+ if (!m_strcmp("*", buf->data)) {
for (tmp = Score; tmp;) {
last = tmp;
tmp = tmp->next;
- mutt_pattern_free (&last->pat);
- mem_free (&last);
+ pattern_list_wipe(&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 (!m_strcmp(buf->data, tmp->str)) {
if (last)
last->next = tmp->next;
else
Score = tmp->next;
- mutt_pattern_free (&tmp->pat);
- mem_free (&tmp);
+ pattern_list_wipe(&tmp->pat);
+ p_delete(&tmp);
/* there should only be one score per pattern, so we can stop here */
break;
}