upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

Fix bug. Remove unnecessary strlen call.

Browse Source
This commit is contained in:
Bruno Haible
2007-02-11 22:38:58 +00:00
parent bea1ec67e3
commit 1006ae023b
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -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.
lib/mbsspn.c
+8 -9
View File
@@ -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