diff options
Diffstat (limited to 'gnulib/lib/mbschr.c')
| -rw-r--r-- | gnulib/lib/mbschr.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/gnulib/lib/mbschr.c b/gnulib/lib/mbschr.c index 5997b18..d66dae8 100644 --- a/gnulib/lib/mbschr.c +++ b/gnulib/lib/mbschr.c @@ -1,5 +1,5 @@ /* Searching a string for a character. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007-2013 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software: you can redistribute it and/or modify @@ -20,37 +20,33 @@ /* Specification. */ #include <string.h> -#if HAVE_MBRTOWC -# include "mbuiter.h" -#endif +#include "mbuiter.h" /* Locate the first single-byte character C in the character string STRING, and return a pointer to it. Return NULL if C is not found in STRING. */ char * mbschr (const char *string, int c) { -#if HAVE_MBRTOWC if (MB_CUR_MAX > 1 /* Optimization: We know that ASCII characters < 0x30 don't occur as - part of multibyte characters longer than 1 byte. Hence, if c < 0x30, - the faster unibyte loop can be used. */ + part of multibyte characters longer than 1 byte. Hence, if c < 0x30, + the faster unibyte loop can be used. */ && (unsigned char) c >= 0x30) { mbui_iterator_t iter; for (mbui_init (iter, string);; mbui_advance (iter)) - { - if (!mbui_avail (iter)) - goto notfound; - if (mb_len (mbui_cur (iter)) == 1 - && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c) - break; - } + { + if (!mbui_avail (iter)) + goto notfound; + if (mb_len (mbui_cur (iter)) == 1 + && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c) + break; + } return (char *) mbui_cur_ptr (iter); notfound: return NULL; } else -#endif return strchr (string, c); } |