X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib%2Frx.c;h=230bf3df0628115022e918ab871add4a01c67c2d;hp=446525584e869d51c8cdce69a065422a05737b58;hb=61fec8f6b3bff64d96d016a14729ab1ea2c4a2e8;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/lib/rx.c b/lib/rx.c
index 4465255..230bf3d 100644
--- a/lib/rx.c
+++ b/lib/rx.c
@@ -9,15 +9,15 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 
 #include "rx.h"
 
-#include "str.h"
 
 rx_t *rx_compile (const char *s, int flags) {
   rx_t *pp = p_new(rx_t, 1);
 
-  pp->pattern = str_dup (s);
+  pp->pattern = m_strdup(s);
   pp->rx = p_new(regex_t, 1);
   if (REGCOMP(pp->rx, NONULL (s), flags) != 0)
     rx_free (&pp);
@@ -33,7 +33,7 @@ void rx_free (rx_t** p) {
 }
 
 int rx_compare (const rx_t* r1, const rx_t* r2) {
-  return (str_cmp (r1->pattern, r2->pattern));
+  return (m_strcmp(r1->pattern, r2->pattern));
 }
 
 int rx_list_match (list2_t* l, const char* pat) {
@@ -51,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 (str_cmp (((rx_t*) l->data[i])->pattern, pat) == 0)
+    if (m_strcmp(((rx_t*) l->data[i])->pattern, pat) == 0)
       return (i);
   return (-1);
 }