unistr/u8-strchr: Optimize non-ASCII argument case.

[gnulib.git] / lib / unistr / u-strspn.h

diff --git a/lib/unistr/u-strspn.h b/lib/unistr/u-strspn.h
index 1bfbc65..d6669af 100644 (file)
--- a/lib/unistr/u-strspn.h
+++ b/lib/unistr/u-strspn.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-2010 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 *accept)
@@ -28,11 +26,11 @@ FUNC (const UNIT *str, const UNIT *accept)
     int count = U_STRMBTOUC (&uc, accept);
     if (count >= 0 && accept[count] == 0)
       {
-       const UNIT *ptr = str;
-       for (; *ptr != 0; ptr += count)
-         if (U_CMP (ptr, accept, count) != 0)
-           break;
-       return ptr - str;
+        const UNIT *ptr = str;
+        for (; *ptr != 0; ptr += count)
+          if (U_CMP (ptr, accept, count) != 0)
+            break;
+        return ptr - str;
       }
   }
   /* General case.  */
@@ -41,15 +39,15 @@ FUNC (const UNIT *str, const UNIT *accept)
 
     for (;;)
       {
-       ucs4_t uc;
-       int count = U_STRMBTOUC (&uc, ptr);
-       if (count == 0)
-         return ptr - str;
-       if (count < 0)
-         break;
-       if (!U_STRCHR (accept, 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 (accept, uc))
+          return ptr - str;
+        ptr += count;
       }
     return U_STRLEN (str);
   }