diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-12-21 12:25:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-12-21 12:25:07 +0000 |
| commit | d17a729b483109285ac4913c3fe4f2c620b87fc6 (patch) | |
| tree | 17c9ddc622b007d816c3b1a9d4e2499dde926da3 /locale/weight.h | |
| parent | 095827866f985081ad64a5eea34c0fe5df854e32 (diff) | |
| download | glibc-d17a729b483109285ac4913c3fe4f2c620b87fc6.tar.gz | |
Update.
1998-12-21 Ulrich Drepper <drepper@cygnus.com>
* inet/gethstbynm_r.c: Remove NEED__RES definition since we do this
anyway for digits_dots.c.
* nss/getXXbyYY.c: Initialize _res before using digits_dots.c
functions.
* nss/getXXbyYY_r.c: Likewise.
1998-12-19 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* sunrpc/key_call.c (getkeyserv_handle): Use __fcntl instead of
fcntl.
1998-12-20 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* locale/weight.h (get_weight): Extract string elements as
unsigned values.
Diffstat (limited to 'locale/weight.h')
| -rw-r--r-- | locale/weight.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/locale/weight.h b/locale/weight.h index 96fb28e987..9a1911bd7a 100644 --- a/locale/weight.h +++ b/locale/weight.h @@ -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) @@ -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) { @@ -174,10 +174,10 @@ get_weight (const STRING_TYPE **str, weight_t *result, We have this strange extra macro since the functions which use the 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) \ |