X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu-strtok.h;h=763dcca76a80de22e514ffa0ce5f8da5b3bb6cb9;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=c76c0e13c6ef7399e94f308df024d954f8d1049b;hpb=14b73993bfb2f18459ee466c3aef0ec6767ece62;p=gnulib.git

diff --git a/lib/unistr/u-strtok.h b/lib/unistr/u-strtok.h
index c76c0e13c..763dcca76 100644
--- a/lib/unistr/u-strtok.h
+++ b/lib/unistr/u-strtok.h
@@ -1,21 +1,19 @@
 /* Tokenize 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/>.  */
 
 UNIT *
 FUNC (UNIT *str, const UNIT *delim, UNIT **ptr)
@@ -24,7 +22,7 @@ FUNC (UNIT *str, const UNIT *delim, UNIT **ptr)
     {
       str = *ptr;
       if (str == NULL)
-	return NULL; /* reminder that end of token sequence has been reached */
+        return NULL; /* reminder that end of token sequence has been reached */
     }
 
   /* Skip leading delimiters.  */
@@ -42,9 +40,9 @@ FUNC (UNIT *str, const UNIT *delim, UNIT **ptr)
     UNIT *token_end = U_STRPBRK (str, delim);
     if (token_end)
       {
-	/* NUL-terminate the token.  */
-	*token_end = 0;
-	*ptr = token_end + 1;
+        /* NUL-terminate the token.  */
+        *token_end = 0;
+        *ptr = token_end + 1;
       }
     else
       *ptr = NULL;