2.5-18.1

1 files changed, 5 insertions, 9 deletions

diff --git a/locale/weightwc.h b/locale/weightwc.h
index ff5e63aeef..436aa7e548 100644
--- a/locale/weightwc.h
+++ b/locale/weightwc.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2001,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2001,2003,2004,2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Ulrich Drepper, <drepper@cygnus.com>.
 
@@ -22,12 +22,8 @@ auto inline int32_t
 __attribute ((always_inline))
 findidx (const wint_t **cpp)
 {
-  int32_t i;
-  const wint_t *cp;
-  wint_t ch;
-
-  ch = *(*cpp)++;
-  i = __collidx_table_lookup ((const char *) table, ch);
+  wint_t ch = *(*cpp)++;
+  int32_t i = __collidx_table_lookup ((const char *) table, ch);
 
   if (i >= 0)
     /* This is an index into the weight table.  Cool.  */
@@ -35,11 +31,11 @@ findidx (const wint_t **cpp)
 
   /* Oh well, more than one sequence starting with this byte.
      Search for the correct one.  */
-  cp = &extra[-i];
+  const int32_t *cp = &extra[-i];
   while (1)
     {
       size_t nhere;
-      const wint_t *usrc = *cpp;
+      const int32_t *usrc = (const int32_t *) *cpp;
 
       /* The first thing is the index.  */
       i = *cp++;