From bfee08023a94899768c682d94a6ff2d702fa4f02 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 11 Feb 2007 22:30:04 +0000 Subject: [PATCH] Small optimization. --- ChangeLog | 3 +++ lib/mbscspn.c | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfe4e299e6..b379469aff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-02-11 Bruno Haible + * 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 index 30153a14ca..543a121fa7 100644 --- a/lib/mbscspn.c +++ b/lib/mbscspn.c @@ -50,8 +50,8 @@ mbscspn (const char *string, const char *accept) { 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 @@ mbscspn (const char *string, const char *accept) 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 -- 2.30.2