Don't initialize with 0.

[kopensolaris-gnu/glibc.git] / locale / weight.h

diff --git a/locale/weight.h b/locale/weight.h
index 76e6537..9a1911b 100644 (file)
--- a/locale/weight.h
+++ b/locale/weight.h
@@ -55,8 +55,8 @@ typedef struct weight_t
 # define collate_rules \
   ((u_int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_RULES))
 
-static __inline int get_weight (const STRING_TYPE **str, weight_t *result);
-static __inline int
+static __inline void get_weight (const STRING_TYPE **str, weight_t *result);
+static __inline void
 get_weight (const STRING_TYPE **str, weight_t *result)
 #else
 # define collate_nrules \
@@ -70,11 +70,11 @@ get_weight (const STRING_TYPE **str, weight_t *result)
 # define collate_rules \
   ((u_int32_t *) current->values[_NL_ITEM_INDEX (_NL_COLLATE_RULES)].string)
 
-static __inline int get_weight (const STRING_TYPE **str, weight_t *result,
-                               struct locale_data *current,
-                               const u_int32_t *__collate_table,
-                               const u_int32_t *__collate_extra);
-static __inline int
+static __inline void get_weight (const STRING_TYPE **str, weight_t *result,
+                                struct locale_data *current,
+                                const u_int32_t *__collate_table,
+                                const u_int32_t *__collate_extra);
+static __inline void
 get_weight (const STRING_TYPE **str, weight_t *result,
            struct locale_data *current, const u_int32_t *__collate_table,
            const u_int32_t *__collate_extra)
@@ -107,7 +107,7 @@ get_weight (const STRING_TYPE **str, weight_t *result,
                  result->data[cnt].value = &__collate_extra[idx];
                  idx += result->data[cnt].number;
                }
-             return 0;
+             return;
            }
          slot += level_size;
        }
@@ -115,7 +115,7 @@ get_weight (const STRING_TYPE **str, weight_t *result,
 
   if (__collate_table[slot + 1] != (u_int32_t) FORWARD_CHAR)
     {
-      /* We have a simple form.  One one value for each weight.  */
+      /* We have a simple form.  One value for each weight.  */
       size_t cnt;
 
       for (cnt = 0; cnt < collate_nrules; ++cnt)
@@ -123,7 +123,7 @@ get_weight (const STRING_TYPE **str, weight_t *result,
          result->data[cnt].number = 1;
          result->data[cnt].value = &__collate_table[slot + 1 + cnt];
        }
-      return ch == 0;
+      return;
     }
 
   /* We now look for any collation element which starts with CH.
@@ -139,10 +139,10 @@ get_weight (const STRING_TYPE **str, weight_t *result,
       /* This is a comparison between a u_int32_t array (aka wchar_t) and
         an 8-bit string.  */
       for (idx = 0; __collate_extra[slot + 2 + idx] != 0; ++idx)
-       if (__collate_extra[slot + 2 + idx] != (u_int32_t) (*str)[idx])
+       if (__collate_extra[slot + 2 + idx] != ((USTRING_TYPE *) *str)[idx])
          break;
 
-      /* When the loop finished with all character of the collation
+      /* When the loop finished with all characters of the collation
         element used, we found the longest prefix.  */
       if (__collate_extra[slot + 2 + idx] == 0)
        {
@@ -156,14 +156,12 @@ get_weight (const STRING_TYPE **str, weight_t *result,
              result->data[cnt].value = &__collate_extra[idx];
              idx += result->data[cnt].number;
            }
-         return 0;
+         return;
        }
 
       /* To next entry in list.  */
       slot += __collate_extra[slot];
     }
-  /* NOTREACHED */
-  return 0;    /* To calm down gcc.  */
 }
 
 
@@ -174,19 +172,19 @@ get_weight (const STRING_TYPE **str, weight_t *result,
    order.
 
    We have this strange extra macro since the functions which use the
-   given locale (not the global one) canot use the global tables.  */
+   given locale (not the global one) cannot use the global tables.  */
 #ifndef USE_IN_EXTENDED_LOCALE_MODEL
-# define call_get_weight(strp, newp) get_weight ((strp), (newp))
+# define call_get_weight(strp, newp) get_weight (strp, newp)
 #else
 # define call_get_weight(strp, newp) \
-  get_weight ((strp), (newp), current, collate_table, collate_extra)
+  get_weight (strp, newp, current, collate_table, collate_extra)
 #endif
 
-#define get_string(str, forw, backw)                                         \
+#define get_string(str, forw, backw) \
   do                                                                         \
     {                                                                        \
       weight_t *newp;                                                        \
-      do                                                                     \
+      while (*str != '\0')                                                   \
        {                                                                     \
          newp = (weight_t *) alloca (sizeof (weight_t)                       \
                                      + (collate_nrules                       \
@@ -199,7 +197,7 @@ get_weight (const STRING_TYPE **str, weight_t *result,
            backw->next = newp;                                               \
          newp->next = NULL;                                                  \
          backw = newp;                                                       \
+         call_get_weight (&str, newp);                                       \
        }                                                                     \
-      while (call_get_weight (&str, newp) == 0);                             \
     }                                                                        \
   while (0)