Update.

[thirdparty/glibc.git] / locale / weightwc.h

diff --git a/locale/weightwc.h b/locale/weightwc.h
index 9e5bcf7f4db6025099635a94f450c8219b7cafea..649b7a77ad41ecdb5f1b91a8ec19f2fbd95a4d61 100644 (file)
--- a/locale/weightwc.h
+++ b/locale/weightwc.h
@@ -1,42 +1,33 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2001, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Ulrich Drepper, <drepper@cygnus.com>.
 
    The GNU C Library 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 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library 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 the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 /* Find index of weight.  */
 static inline int32_t
+__attribute ((always_inline))
 findidx (const wint_t **cpp)
 {
-  int_fast32_t i;
+  int32_t i;
   const wint_t *cp;
   wint_t ch;
-  size_t idx;
-  size_t cnt = 0;
 
   ch = *(*cpp)++;
-  idx = ch % size;
-  while (names[idx] != ch)
-    {
-      if (++cnt == layers)
-       /* We didn't find the name.  It is case for UNDEFINED.  */
-       return 0;
-      idx += size;
-    }
-  i = table[idx];
+  i = collidx_table_lookup ((const char *) table, ch);
 
   if (i >= 0)
     /* This is an index into the weight table.  Cool.  */
@@ -51,8 +42,7 @@ findidx (const wint_t **cpp)
       const wint_t *usrc = *cpp;
 
       /* The first thing is the index.  */
-      i = cp;
-      ++cp;
+      i = *cp++;
 
       /* Next is the length of the byte sequence.  These are always
         short byte sequences so there is no reason to call any