X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=c40f9cac6aa45cece8e663f519b5610a39548a94;hp=eb371fc2d1e7146b39ecd292c4e08d1faf7132de;hb=ecaab35b973fbceb58b5ed174971c82762cc0199;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/pattern.c b/pattern.c
index eb371fc..c40f9ca 100644
--- a/pattern.c
+++ b/pattern.c
@@ -12,20 +12,20 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
 #include "handler.h"
 #include "enter.h"
-#include "ascii.h"
 #include "mx.h"
 #include "mapping.h"
 #include "keymap.h"
 #include "copy.h"
 #include "mime.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #ifdef USE_IMAP
 #include "mx.h"
@@ -225,7 +225,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
         match = 1;
         break;
       }
-      lng -= str_len (buf);
+      lng -= m_strlen(buf);
     }
 
     p_delete(&buf);
@@ -266,7 +266,7 @@ int eat_regexp (pattern_t * pat, BUFFER * s, BUFFER * err)
 #endif
 
   if (pat->stringmatch) {
-    pat->str = str_dup (buf.data);
+    pat->str = m_strdup(buf.data);
     p_delete(&buf.data);
   } else {
     pat->rx = p_new(regex_t, 1);
@@ -714,7 +714,7 @@ pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err)
 
   memset (&ps, 0, sizeof (ps));
   ps.dptr = s;
-  ps.dsize = str_len (s);
+  ps.dsize = m_strlen(s);
 
   while (*ps.dptr) {
     SKIPWS (ps.dptr);
@@ -1209,7 +1209,7 @@ int mutt_pattern_func (int op, char *prompt)
 
   mutt_message _("Compiling search pattern...");
 
-  simple = str_dup (buf);
+  simple = m_strdup(buf);
   mutt_check_simple (buf, sizeof (buf), NONULL (SimpleSearch));
 
   err.data = error;