X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Funistr%2Fu-strcspn.h;h=d55294aef020711f4857464c176ce28148500ae0;hb=cea318a913148d825c03a4e45f4553e4cb4e2880;hp=a989a56baf9ef8bd10e90de9a133cd1d79d7da27;hpb=61789de541dfd8a793be0d73ce8d1ba8d595311e;p=gnulib.git

diff --git a/lib/unistr/u-strcspn.h b/lib/unistr/u-strcspn.h
index a989a56ba..d55294aef 100644
--- a/lib/unistr/u-strcspn.h
+++ b/lib/unistr/u-strcspn.h
@@ -1,21 +1,19 @@
 /* Search for some characters in UTF-8/UTF-16/UTF-32 string.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by 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
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library 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.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 size_t
 FUNC (const UNIT *str, const UNIT *reject)
@@ -28,11 +26,11 @@ FUNC (const UNIT *str, const UNIT *reject)
     int count = U_STRMBTOUC (&uc, reject);
     if (count >= 0 && reject[count] == 0)
       {
-	const UNIT *found = U_STRCHR (str, uc);
-	if (found != NULL)
-	  return found - str;
-	else
-	  return U_STRLEN (str);
+        const UNIT *found = U_STRCHR (str, uc);
+        if (found != NULL)
+          return found - str;
+        else
+          return U_STRLEN (str);
       }
   }
   /* General case.  */
@@ -41,15 +39,15 @@ FUNC (const UNIT *str, const UNIT *reject)
 
     for (;;)
       {
-	ucs4_t uc;
-	int count = U_STRMBTOUC (&uc, ptr);
-	if (count == 0)
-	  return ptr - str;
-	if (count < 0)
-	  break;
-	if (U_STRCHR (reject, uc))
-	  return ptr - str;
-	ptr += count;
+        ucs4_t uc;
+        int count = U_STRMBTOUC (&uc, ptr);
+        if (count == 0)
+          return ptr - str;
+        if (count < 0)
+          break;
+        if (U_STRCHR (reject, uc))
+          return ptr - str;
+        ptr += count;
       }
     return U_STRLEN (str);
   }