X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbsspn.c;h=07f07806ccd45b4cc8d54a8884af2d26cfa6aecc;hb=3ac9b4577c78342bdd022b31cf56de2b12f7297b;hp=3ef41ca1b3ede2cd8b8c11cb1caaaca6175b32b9;hpb=4eda4ba54f3cf29f6b7fe4458e719cd2325be4c4;p=gnulib.git diff --git a/lib/mbsspn.c b/lib/mbsspn.c index 3ef41ca1b..07f07806c 100644 --- a/lib/mbsspn.c +++ b/lib/mbsspn.c @@ -1,5 +1,5 @@ /* Searching a string for a character outside a given set of characters. - Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2010 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software: you can redistribute it and/or modify @@ -37,24 +37,24 @@ mbsspn (const char *string, const char *reject) unsigned char uc = (unsigned char) reject[0]; if (MB_CUR_MAX > 1) - { - mbui_iterator_t iter; + { + mbui_iterator_t iter; - 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)) - break; - return mbui_cur_ptr (iter) - string; - } + 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)) + break; + return mbui_cur_ptr (iter) - string; + } else - { - const char *ptr; + { + const char *ptr; - for (ptr = string; *ptr != '\0'; ptr++) - if ((unsigned char) *ptr != uc) - break; - return ptr - string; - } + for (ptr = string; *ptr != '\0'; ptr++) + if ((unsigned char) *ptr != uc) + break; + return ptr - string; + } } /* General case. */ if (MB_CUR_MAX > 1) @@ -62,25 +62,25 @@ mbsspn (const char *string, const char *reject) mbui_iterator_t iter; for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter)) - { - if (mb_len (mbui_cur (iter)) == 1) - { - if (mbschr (reject, * mbui_cur_ptr (iter)) == NULL) - goto found; - } - else - { - mbui_iterator_t aiter; + { + if (mb_len (mbui_cur (iter)) == 1) + { + if (mbschr (reject, * mbui_cur_ptr (iter)) == NULL) + goto found; + } + else + { + mbui_iterator_t aiter; - for (mbui_init (aiter, reject);; mbui_advance (aiter)) - { - if (!mbui_avail (aiter)) - goto found; - if (mb_equal (mbui_cur (aiter), mbui_cur (iter))) - break; - } - } - } + for (mbui_init (aiter, reject);; mbui_advance (aiter)) + { + if (!mbui_avail (aiter)) + goto found; + if (mb_equal (mbui_cur (aiter), mbui_cur (iter))) + break; + } + } + } found: return mbui_cur_ptr (iter) - string; }