JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* locale.cc (add_locale_alias_locales): Always use loc_num at function

Browse Source 
start to avoid confusing bsearch.
This commit is contained in:
Corinna Vinschen 2010-03-23 21:26:03 +00:00
parent 1399e29a1f
commit 536ad25322
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
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> 2010-03-23 Corinna Vinschen <corinna@vinschen.de>
* locale.cc: Revert accidental checkin of unfinished changes. * locale.cc: Revert accidental checkin of unfinished changes.

3
winsup/utils/locale.cc
View File

@ -209,6 +209,7 @@ add_locale_alias_locales ()
const char *alias, *replace; const char *alias, *replace;
char orig_locale[32]; char orig_locale[32];
loc_t search, *loc; loc_t search, *loc;
size_t orig_loc_num = loc_num;
FILE *fp = fopen (LOCALE_ALIAS, "rt"); FILE *fp = fopen (LOCALE_ALIAS, "rt");
if (!fp) if (!fp)
@ -237,7 +238,7 @@ add_locale_alias_locales ()
if (c) if (c)
*c = '\0'; *c = '\0';
search.name = replace; 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); compare_locales);
add_locale (alias, loc ? loc->language : L"", loc ? loc->territory : L"", add_locale (alias, loc ? loc->language : L"", loc ? loc->territory : L"",
true); true);