Fix bug. Remove unnecessary strlen call.

diff --git a/ChangeLog b/ChangeLog
index c10aea2054a11db5322d02f9d5ac4f9f12de9c90..2bbc6e52e8fc133ab66ad046b2f7ac5209392823 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-02-11  Bruno Haible  <bruno@clisp.org>
 
+       * lib/mbsspn.c (mbsspn): Fix bug. Remove unnecessary strlen call.
+
        * modules/mbsspn-tests: New file.
        * tests/test-mbsspn.sh: New file.
        * tests/test-mbsspn.c: New file.

diff --git a/lib/mbsspn.c b/lib/mbsspn.c
index f25c9096c1412314230a89fb03ad46fe2109b9fa..921c953897f583532a6803bfe9ac61cb0da1f748 100644 (file)
--- a/lib/mbsspn.c
+++ b/lib/mbsspn.c
@@ -47,8 +47,8 @@ mbsspn (const char *string, const char *reject)
          for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
            if (!(mb_len (mbui_cur (iter)) == 1
                  && (unsigned char) * mbui_cur_ptr (iter) == uc))
-             return mbui_cur_ptr (iter) - string;
-         return strlen (string);
+             break;
+         return mbui_cur_ptr (iter) - string;
        }
       else
 #endif
@@ -71,25 +71,24 @@ mbsspn (const char *string, const char *reject)
        {
          if (mb_len (mbui_cur (iter)) == 1)
            {
-             if (mbschr (reject, (unsigned char) * mbui_cur_ptr (iter)) == NULL)
-               return mbui_cur_ptr (iter) - string;
+             if (mbschr (reject, * mbui_cur_ptr (iter)) == NULL)
+               goto found;
            }
          else
            {
              mbui_iterator_t aiter;
 
-             for (mbui_init (aiter, reject);
-                  mbui_avail (aiter);
-                  mbui_advance (aiter))
+             for (mbui_init (aiter, reject);; mbui_advance (aiter))
                {
                  if (!mbui_avail (aiter))
-                   return mbui_cur_ptr (iter) - string;
+                   goto found;
                  if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
                    break;
                }
            }
        }
-      return strlen (string);
+     found:
+      return mbui_cur_ptr (iter) - string;
     }
   else
 #endif