Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / lib / unistr / u32-strcspn.c

diff --git a/lib/unistr/u32-strcspn.c b/lib/unistr/u32-strcspn.c
index c543d4f..a893584 100644 (file)
--- a/lib/unistr/u32-strcspn.c
+++ b/lib/unistr/u32-strcspn.c
@@ -1,21 +1,19 @@
 /* Search for some characters in UTF-32 string.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2014 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/>.  */
 
 #include <config.h>
 
@@ -38,8 +36,8 @@ FUNC (const UNIT *str, const UNIT *reject)
       ucs4_t uc = reject[0];
       const UNIT *ptr = str;
       for (; *ptr != 0; ptr++)
-       if (*ptr == uc)
-         break;
+        if (*ptr == uc)
+          break;
       return ptr - str;
     }
   /* General case.  */
@@ -47,7 +45,7 @@ FUNC (const UNIT *str, const UNIT *reject)
     const UNIT *ptr = str;
     for (; *ptr != 0; ptr++)
       if (U_STRCHR (reject, *ptr))
-       break;
+        break;
     return ptr - str;
   }
 }