diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-09-11 16:02:17 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-09-11 16:02:17 -0700 |
| commit | 8c0ab919f63dc03a420751172602a52d2bea59a8 (patch) | |
| tree | a196619b2a14716dd6896b2dc26c5719940a0e6a /string | |
| parent | 52ffbdf25a1100986f4ae27bb0febbe5a722ab25 (diff) | |
| download | glibc-8c0ab919f63dc03a420751172602a52d2bea59a8.tar.gz glibc-8c0ab919f63dc03a420751172602a52d2bea59a8.tar.xz glibc-8c0ab919f63dc03a420751172602a52d2bea59a8.zip | |
Move findidx nested functions to top-level.
Diffstat (limited to 'string')
| -rw-r--r-- | string/strcoll_l.c | 9 | ||||
| -rw-r--r-- | string/strxfrm_l.c | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/string/strcoll_l.c b/string/strcoll_l.c index 10ce4a67ce..d4f42a32e5 100644 --- a/string/strcoll_l.c +++ b/string/strcoll_l.c @@ -41,6 +41,7 @@ #define CONCAT1(a,b) a##b #include "../locale/localeinfo.h" +#include WEIGHT_H /* Track status while looking for sequences in a string. */ typedef struct @@ -152,7 +153,6 @@ get_next_seq (coll_seq *seq, int nrules, const unsigned char *rulesets, const USTRING_TYPE *weights, const int32_t *table, const USTRING_TYPE *extra, const int32_t *indirect) { -#include WEIGHT_H size_t val = seq->val = 0; int len = seq->len; size_t backw_stop = seq->backw_stop; @@ -194,7 +194,7 @@ get_next_seq (coll_seq *seq, int nrules, const unsigned char *rulesets, while (*us != L('\0')) { - int32_t tmp = findidx (&us, -1); + int32_t tmp = findidx (table, indirect, extra, &us, -1); rulearr[idxmax] = tmp >> 24; idxarr[idxmax] = tmp & 0xffffff; idxcnt = idxmax++; @@ -242,7 +242,6 @@ get_next_seq_nocache (coll_seq *seq, int nrules, const unsigned char *rulesets, const USTRING_TYPE *extra, const int32_t *indirect, int pass) { -#include WEIGHT_H size_t val = seq->val = 0; int len = seq->len; size_t backw_stop = seq->backw_stop; @@ -285,7 +284,7 @@ get_next_seq_nocache (coll_seq *seq, int nrules, const unsigned char *rulesets, us = seq->back_us; while (i < backw) { - int32_t tmp = findidx (&us, -1); + int32_t tmp = findidx (table, indirect, extra, &us, -1); idx = tmp & 0xffffff; i++; } @@ -300,7 +299,7 @@ get_next_seq_nocache (coll_seq *seq, int nrules, const unsigned char *rulesets, while (*us != L('\0')) { - int32_t tmp = findidx (&us, -1); + int32_t tmp = findidx (table, indirect, extra, &us, -1); unsigned char rule = tmp >> 24; prev_idx = idx; idx = tmp & 0xffffff; diff --git a/string/strxfrm_l.c b/string/strxfrm_l.c index 04b9338f05..2d3f1bd5fc 100644 --- a/string/strxfrm_l.c +++ b/string/strxfrm_l.c @@ -41,6 +41,7 @@ #define CONCAT1(a,b) a##b #include "../locale/localeinfo.h" +#include WEIGHT_H #ifndef WIDE_CHAR_VERSION @@ -104,8 +105,6 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) size_t idxcnt; int use_malloc; -#include WEIGHT_H - if (nrules == 0) { if (n != 0) @@ -174,7 +173,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) idxmax = 0; do { - int32_t tmp = findidx (&usrc, -1); + int32_t tmp = findidx (table, indirect, extra, &usrc, -1); rulearr[idxmax] = tmp >> 24; idxarr[idxmax] = tmp & 0xffffff; |