X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmbsrchr.c;h=9cc9ca8f0f21bfcda6def54aee76e753a07835f8;hb=22ef18caa644201427aaa19960ee4b3f91b4eee4;hp=f3b280845177888e95c268e119ff3f9e1e26ad98;hpb=809b538c774eb4689227b7b4fde2ff12f7b8a54a;p=gnulib.git

diff --git a/lib/mbsrchr.c b/lib/mbsrchr.c
index f3b280845..9cc9ca8f0 100644
--- a/lib/mbsrchr.c
+++ b/lib/mbsrchr.c
@@ -40,13 +40,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;
     }