X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbscspn.c;h=e0818e19d4d24239c235d5e961d709d8a87cd7e1;hb=2217763ff0775fa8093a26acfc1b51b726bb358a;hp=30153a14ca59be05134fe13b3f981aaf71927687;hpb=2f6c32bf5803ab9ee24ae43b9042616b10773b41;p=gnulib.git

diff --git a/lib/mbscspn.c b/lib/mbscspn.c
index 30153a14c..e0818e19d 100644
--- a/lib/mbscspn.c
+++ b/lib/mbscspn.c
@@ -2,10 +2,10 @@
    Copyright (C) 1999, 2002, 2006-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>
 
@@ -50,8 +49,8 @@ mbscspn (const char *string, const char *accept)
 	{
 	  if (mb_len (mbui_cur (iter)) == 1)
 	    {
-	      if (mbschr (accept, (unsigned char) * mbui_cur_ptr (iter)))
-		return mbui_cur_ptr (iter) - string;
+	      if (mbschr (accept, * mbui_cur_ptr (iter)))
+		goto found;
 	    }
 	  else
 	    {
@@ -61,10 +60,11 @@ mbscspn (const char *string, const char *accept)
 		   mbui_avail (aiter);
 		   mbui_advance (aiter))
 		if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
-		  return mbui_cur_ptr (iter) - string;
+		  goto found;
 	    }
 	}
-      return strlen (string);
+     found:
+      return mbui_cur_ptr (iter) - string;
     }
   else
 #endif