# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1171233004 0
# Node ID d18923c964ae17636c1e7a6938c8a0ce4b9c107b
# Parent  32304cd3cf05b65f39375a463ddd0b549f8bf572
Small optimization.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-02-11  Bruno Haible  <bruno@clisp.org>
 
+	* lib/mbscspn.c (mbscspn): Remove unnecessary strlen call and
+	unneeded cast.
+
 	* modules/mbscspn-tests: New file.
 	* tests/test-mbscspn.sh: New file.
 	* tests/test-mbscspn.c: New file.
diff --git a/lib/mbscspn.c b/lib/mbscspn.c
--- a/lib/mbscspn.c
+++ b/lib/mbscspn.c
@@ -50,8 +50,8 @@
 	{
 	  if (mb_len (mbui_cur (iter)) == 1)
 	    {
-	      if (mbschr (accept, (unsigned char) * mbui_cur_ptr (iter)))
-		return mbui_cur_ptr (iter) - string;
+	      if (mbschr (accept, * mbui_cur_ptr (iter)))
+		goto found;
 	    }
 	  else
 	    {
@@ -61,10 +61,11 @@
 		   mbui_avail (aiter);
 		   mbui_advance (aiter))
 		if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
-		  return mbui_cur_ptr (iter) - string;
+		  goto found;
 	    }
 	}
-      return strlen (string);
+     found:
+      return mbui_cur_ptr (iter) - string;
     }
   else
 #endif