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

diff --git a/lib/mbsrchr.c b/lib/mbsrchr.c
index f3b280845..679f9a48f 100644
--- a/lib/mbsrchr.c
+++ b/lib/mbsrchr.c
@@ -2,10 +2,10 @@
    Copyright (C) 2007 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,8 +13,7 @@
    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>
 
@@ -40,13 +39,11 @@ mbsrchr (const char *string, int c)
       const char *result = NULL;
       mbui_iterator_t iter;
 
-      for (mbui_init (iter, string);; mbui_advance (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) == (unsigned char) c)
 	    result = mbui_cur_ptr (iter);
-	  if (!mbui_avail (iter))
-	    break;
 	}
       return (char *) result;
     }