X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu16-chr.c;h=dab4ce36c866a6d2d0070cf45343fe52a5f37301;hb=b344de996cd51f8a2f2558a3172016b64d99c622;hp=6ca1458b632651a76c985d2fce1b118d2aeee692;hpb=4a36ce8554cf078dee9d708ebbb8dcee32d237d2;p=gnulib.git

diff --git a/lib/unistr/u16-chr.c b/lib/unistr/u16-chr.c
index 6ca1458b6..dab4ce36c 100644
--- a/lib/unistr/u16-chr.c
+++ b/lib/unistr/u16-chr.c
@@ -1,29 +1,26 @@
 /* Search character in piece of UTF-16 string.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2007, 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>
 
 /* Specification.  */
 #include "unistr.h"
 
-#include "ucs4-utf16.h"
-
 uint16_t *
 u16_chr (const uint16_t *s, size_t n, ucs4_t uc)
 {
@@ -34,27 +31,27 @@ u16_chr (const uint16_t *s, size_t n, ucs4_t uc)
       uint16_t c0 = uc;
 
       for (; n > 0; s++, n--)
-	{
-	  if (*s == c0)
-	    return (uint16_t *) s;
-	}
+        {
+          if (*s == c0)
+            return (uint16_t *) s;
+        }
     }
   else
     switch (u16_uctomb_aux (c, uc, 2))
       {
       case 2:
-	if (n > 1)
-	  {
-	    uint16_t c0 = c[0];
-	    uint16_t c1 = c[1];
-
-	    for (n--; n > 0; s++, n--)
-	      {
-		if (*s == c0 && s[1] == c1)
-		  return (uint16_t *) s;
-	      }
-	  }
-	break;
+        if (n > 1)
+          {
+            uint16_t c0 = c[0];
+            uint16_t c1 = c[1];
+
+            for (n--; n > 0; s++, n--)
+              {
+                if (*s == c0 && s[1] == c1)
+                  return (uint16_t *) s;
+              }
+          }
+        break;
       }
   return NULL;
 }