X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib%2Frx.c;h=55951085ef85a605ebfc148d4b27c8a327556341;hp=168a3fe8ecbcc3d5582e40d24a766de5d7f2a125;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=c23f86bc470912384ba875157b5b0fb7a8a1931a

diff --git a/lib/rx.c b/lib/rx.c
index 168a3fe..5595108 100644
--- a/lib/rx.c
+++ b/lib/rx.c
@@ -8,16 +8,17 @@
 #include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+
 #include "rx.h"
 
-#include "mem.h"
-#include "str.h"
 
 rx_t *rx_compile (const char *s, int flags) {
-  rx_t *pp = safe_calloc (1, sizeof (rx_t));
+  rx_t *pp = p_new(rx_t, 1);
 
-  pp->pattern = safe_strdup (s);
-  pp->rx = safe_calloc (1, sizeof (regex_t));
+  pp->pattern = m_strdup(s);
+  pp->rx = p_new(regex_t, 1);
   if (REGCOMP(pp->rx, NONULL (s), flags) != 0)
     rx_free (&pp);
 
@@ -25,14 +26,14 @@ rx_t *rx_compile (const char *s, int flags) {
 }
 
 void rx_free (rx_t** p) {
-  FREE(&(*p)->pattern);
+  p_delete(&(*p)->pattern);
   regfree ((*p)->rx);
-  FREE(&(*p)->rx);
-  FREE(p);
+  p_delete(&(*p)->rx);
+  p_delete(p);
 }
 
 int rx_compare (const rx_t* r1, const rx_t* r2) {
-  return (mutt_strcmp (r1->pattern, r2->pattern));
+  return (str_cmp (r1->pattern, r2->pattern));
 }
 
 int rx_list_match (list2_t* l, const char* pat) {
@@ -50,7 +51,7 @@ int rx_lookup (list2_t* l, const char* pat) {
   if (!pat || !*pat || list_empty(l))
     return (-1);
   for (i = 0; i < l->length; i++)
-    if (mutt_strcmp (((rx_t*) l->data[i])->pattern, pat) == 0)
+    if (str_cmp (((rx_t*) l->data[i])->pattern, pat) == 0)
       return (i);
   return (-1);
 }