X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbspbrk.c;h=173c8032c4988a8219eb50e0fd0cbcdfe41c0fe8;hb=533101a268dc5015a140ff4695d8eeb04fbe57b6;hp=bf56d5a1e01d53adcf24ebe716ec3f87741a229e;hpb=4eda4ba54f3cf29f6b7fe4458e719cd2325be4c4;p=gnulib.git diff --git a/lib/mbspbrk.c b/lib/mbspbrk.c index bf56d5a1e..173c8032c 100644 --- a/lib/mbspbrk.c +++ b/lib/mbspbrk.c @@ -1,5 +1,5 @@ /* Searching a string for a character among a given set of characters. - Copyright (C) 1999, 2002, 2006-2008 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2013 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software: you can redistribute it and/or modify @@ -39,23 +39,23 @@ mbspbrk (const char *string, const char *accept) mbui_iterator_t iter; for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter)) - { - if (mb_len (mbui_cur (iter)) == 1) - { - if (mbschr (accept, * mbui_cur_ptr (iter))) - return (char *) mbui_cur_ptr (iter); - } - else - { - mbui_iterator_t aiter; - - for (mbui_init (aiter, accept); - mbui_avail (aiter); - mbui_advance (aiter)) - if (mb_equal (mbui_cur (aiter), mbui_cur (iter))) - return (char *) mbui_cur_ptr (iter); - } - } + { + if (mb_len (mbui_cur (iter)) == 1) + { + if (mbschr (accept, * mbui_cur_ptr (iter))) + return (char *) mbui_cur_ptr (iter); + } + else + { + mbui_iterator_t aiter; + + for (mbui_init (aiter, accept); + mbui_avail (aiter); + mbui_advance (aiter)) + if (mb_equal (mbui_cur (aiter), mbui_cur (iter))) + return (char *) mbui_cur_ptr (iter); + } + } return NULL; } else