X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbsrchr.c;h=c505c68fe31f39d5e452b0f57f53d818da5c19c6;hb=6951841b81058b0dd883fcdeb2be31d6aa8b8658;hp=f3b280845177888e95c268e119ff3f9e1e26ad98;hpb=809b538c774eb4689227b7b4fde2ff12f7b8a54a;p=gnulib.git

diff --git a/lib/mbsrchr.c b/lib/mbsrchr.c
index f3b280845..c505c68fe 100644
--- a/lib/mbsrchr.c
+++ b/lib/mbsrchr.c
@@ -1,11 +1,11 @@
 /* Searching a string for the last occurrence of a character.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,44 +13,37 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 /* Locate the last 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 *
 mbsrchr (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)
     {
       const char *result = NULL;
       mbui_iterator_t iter;
 
-      for (mbui_init (iter, string);; mbui_advance (iter))
-	{
-	  if (mb_len (mbui_cur (iter)) == 1
-	      && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c)
-	    result = mbui_cur_ptr (iter);
-	  if (!mbui_avail (iter))
-	    break;
-	}
+      for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
+        {
+          if (mb_len (mbui_cur (iter)) == 1
+              && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c)
+            result = mbui_cur_ptr (iter);
+        }
       return (char *) result;
     }
   else
-#endif
     return strrchr (string, c);
 }