#include <lib-lib/buffer.h>
#include <lib-lib/mapping.h>
#include <lib-lib/debug.h>
+#include <lib-lib/rx.h>
#include <lib-ui/curses.h>
#include "mutt_idna.h"
#if defined(USE_SSL) || defined(USE_GNUTLS)
-#include <lib-network/mutt_ssl.h>
+#include <lib-sys/mutt_ssl.h>
#endif
#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
#include "mx.h"
#include "init.h"
-#include "lib/rx.h"
#include "lib/list.h"
#include <ctype.h>
i = rx_lookup ((*list), rx->pattern);
if (i >= 0)
- rx_free (&rx);
+ rx_delete(&rx);
else
list_push_back (list, rx);
return 0;
return 0;
if (spam->rx && !m_strcmp(spam->rx->pattern, pat)) {
*list = spam->next;
- rx_free (&spam->rx);
+ rx_delete(&spam->rx);
p_delete(&spam->template);
p_delete(&spam);
return 1;
for (spam = prev->next; spam;) {
if (!m_strcmp(spam->rx->pattern, pat)) {
prev->next = spam->next;
- rx_free (&spam->rx);
+ rx_delete(&spam->rx);
p_delete(&spam->template);
p_delete(&spam);
spam = prev->next;
int i = 0;
if (m_strcmp("*", str) == 0) {
- list_del (l, (list_del_t*) rx_free);
+ list_del (l, (list_del_t*) rx_delete);
return (0);
}
else {
i = rx_lookup ((*l), str);
if (i >= 0) {
rx_t* r = list_pop_idx ((*l), i);
- rx_free (&r);
+ rx_delete(&r);
return (0);
}
}
/* "*" is a special case. */
if (!m_strcmp(buf->data, "*")) {
mutt_free_spam_list (&SpamList);
- list_del (&NoSpamList, (list_del_t*) rx_free);
+ list_del (&NoSpamList, (list_del_t*) rx_delete);
return 0;
}