X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=regex.c;h=b2755caecf1639072bc15821049527e374a4b9f1;hp=9db19c585c7c6b839f5140349b7e410b23a23941;hb=f5b0a93af0b948eaeabe061f5e75f686c7eaef79;hpb=841934011451205d8295ac955486f06c317fdf15

diff --git a/regex.c b/regex.c
index 9db19c5..b2755ca 100644
--- a/regex.c
+++ b/regex.c
@@ -98,6 +98,7 @@
 #include "lisp.h"
 #include "buffer.h"
 #include "syntax.h"
+#include "lib/str.h"
 
 #else /* not emacs */
 
@@ -2426,11 +2427,13 @@ static reg_errcode_t regex_compile (pattern, size, syntax, bufp)
         if (syntax & RE_NO_BK_PARENS)
           goto normal_backslash;
 
-        if (COMPILE_STACK_EMPTY)
-          if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
+        if (COMPILE_STACK_EMPTY) {
+          if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) {
             goto normal_backslash;
-          else
+          } else {
             FREE_STACK_RETURN (REG_ERPAREN);
+          }
+        }
 
       handle_close:
         if (fixup_alt_jump) {   /* Push a dummy failure point at the end of the
@@ -2445,11 +2448,13 @@ static reg_errcode_t regex_compile (pattern, size, syntax, bufp)
         }
 
         /* See similar code for backslashed left paren above.  */
-        if (COMPILE_STACK_EMPTY)
-          if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
+        if (COMPILE_STACK_EMPTY) {
+          if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) {
             goto normal_char;
-          else
+          } else {
             FREE_STACK_RETURN (REG_ERPAREN);
+          }
+        }
 
         /* Since we just checked for an empty stack above, this
            ``can't happen''.  */
@@ -5385,7 +5390,7 @@ re_comp (s)
   /* Match anchors at newlines.  */
   re_comp_buf.newline_anchor = 1;
 
-  ret = regex_compile (s, mutt_strlen (s), re_syntax_options, &re_comp_buf);
+  ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf);
 
   if (!ret)
     return NULL;
@@ -5402,7 +5407,7 @@ int
 re_exec (s)
      const char *s;
 {
-  const int len = mutt_strlen (s);
+  const int len = strlen (s);
 
   return
     0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
@@ -5499,8 +5504,8 @@ int regcomp (preg, pattern, cflags)
   preg->no_sub = !!(cflags & REG_NOSUB);
 
   /* POSIX says a null character in the pattern terminates it, so we
-     can use mutt_strlen here in compiling the pattern.  */
-  ret = regex_compile (pattern, mutt_strlen (pattern), syntax, preg);
+     can use strlen here in compiling the pattern.  */
+  ret = regex_compile (pattern, strlen (pattern), syntax, preg);
 
   /* POSIX doesn't distinguish between an unmatched open-group and an
      unmatched close-group: both are REG_EPAREN.  */
@@ -5535,7 +5540,7 @@ int regexec (preg, string, nmatch, pmatch, eflags)
   int ret;
   struct re_registers regs;
   regex_t private_preg;
-  int len = mutt_strlen (string);
+  int len = strlen (string);
   boolean want_reg_info = !preg->no_sub && nmatch > 0;
 
   private_preg = *preg;
@@ -5604,7 +5609,7 @@ size_t regerror (errcode, preg, errbuf, errbuf_size)
 
   msg = gettext (re_error_msgid[errcode]);
 
-  msg_size = mutt_strlen (msg) + 1;  /* Includes the null.  */
+  msg_size = strlen (msg) + 1;  /* Includes the null.  */
 
   if (errbuf_size != 0) {
     if (msg_size > errbuf_size) {