X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu16-cmp.c;h=4e3e136fa227611b1cf5ff2001731b25795df25e;hb=4fe68d4176b4f0da64660bb9ce0f5412a6bb24de;hp=3b2b4c856d4371ad624f715cec50cdc4e66283ef;hpb=f3df4c99750b1debd07c30d60770b06a6c0be30e;p=gnulib.git

diff --git a/lib/unistr/u16-cmp.c b/lib/unistr/u16-cmp.c
index 3b2b4c856..4e3e136fa 100644
--- a/lib/unistr/u16-cmp.c
+++ b/lib/unistr/u16-cmp.c
@@ -1,21 +1,19 @@
 /* Compare pieces of UTF-16 strings.
-   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/>.  */
 
 #include <config.h>
 
@@ -33,22 +31,22 @@ u16_cmp (const uint16_t *s1, const uint16_t *s2, size_t n)
       uint16_t c1 = *s1++;
       uint16_t c2 = *s2++;
       if (c1 == c2)
-	{
-	  n--;
-	  continue;
-	}
+        {
+          n--;
+          continue;
+        }
       if (c1 < 0xd800 || c1 >= 0xe000)
-	{
-	  if (!(c2 < 0xd800 || c2 >= 0xe000))
-	    /* c2 is a surrogate, but c1 is not.  */
-	    return -1;
-	}
+        {
+          if (!(c2 < 0xd800 || c2 >= 0xe000))
+            /* c2 is a surrogate, but c1 is not.  */
+            return -1;
+        }
       else
-	{
-	  if (c2 < 0xd800 || c2 >= 0xe000)
-	    /* c1 is a surrogate, but c2 is not.  */
-	    return 1;
-	}
+        {
+          if (c2 < 0xd800 || c2 >= 0xe000)
+            /* c1 is a surrogate, but c2 is not.  */
+            return 1;
+        }
       return (int)c1 - (int)c2;
       /* > 0 if c1 > c2, < 0 if c1 < c2. */
     }