diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-03-24 00:26:03 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-03-24 00:26:03 +0300 |
| commit | 536ad253225ab71d4adfc2c5f54391159412cb5f (patch) | |
| tree | 0bfaf01f4deaece25d3c2cb01cf1e3d98c56010f | |
| parent | 1399e29a1fb57175ee2266153bd7f868030c3fa0 (diff) | |
* locale.cc (add_locale_alias_locales): Always use loc_num at function
start to avoid confusing bsearch.
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/locale.cc | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 1d19c1864..834bf1a6a 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,10 @@ 2010-03-23 Corinna Vinschen <corinna@vinschen.de> + * locale.cc (add_locale_alias_locales): Always use loc_num at function + start to avoid confusing bsearch. + +2010-03-23 Corinna Vinschen <corinna@vinschen.de> + * locale.cc: Revert accidental checkin of unfinished changes. 2010-03-23 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/utils/locale.cc b/winsup/utils/locale.cc index 0a480dc71..68acb8298 100644 --- a/winsup/utils/locale.cc +++ b/winsup/utils/locale.cc @@ -209,6 +209,7 @@ add_locale_alias_locales () const char *alias, *replace; char orig_locale[32]; loc_t search, *loc; + size_t orig_loc_num = loc_num; FILE *fp = fopen (LOCALE_ALIAS, "rt"); if (!fp) @@ -237,7 +238,7 @@ add_locale_alias_locales () if (c) *c = '\0'; search.name = replace; - loc = (loc_t *) bsearch (&search, locale, loc_num, sizeof (loc_t), + loc = (loc_t *) bsearch (&search, locale, orig_loc_num, sizeof (loc_t), compare_locales); add_locale (alias, loc ? loc->language : L"", loc ? loc->territory : L"", true); |