qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix constness error just introduced in findlocale. 

for  ChangeLog

	[BZ #15969]
	* locale/findlocale.c (_nl_find_locale): Fix constness error in
	the previous change.
This commit is contained in:
Alexandre Oliva 2015-02-26 02:46:02 -03:00
parent 0d822a016b
commit 23d43090e0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2015-02-26 Alexandre Oliva <aoliva@redhat.com> 2015-02-26 Alexandre Oliva <aoliva@redhat.com>
[BZ #15969]
* locale/findlocale.c (_nl_find_locale): Fix constness error in
the previous change.
[BZ #15969] [BZ #15969]
* locale/findlocale.c (_nl_find_locale): Retry archive search * locale/findlocale.c (_nl_find_locale): Retry archive search
after alias expansion. after alias expansion.

3
locale/findlocale.c
View File

@ -161,7 +161,8 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
loc_name = (char *) _nl_expand_alias (*name); loc_name = (char *) _nl_expand_alias (*name);
if (loc_name != NULL) if (loc_name != NULL)
{ {
data = _nl_load_locale_from_archive (category, &loc_name); data = _nl_load_locale_from_archive (category,
(const char **) &loc_name);
if (__builtin_expect (data != NULL, 1)) if (__builtin_expect (data != NULL, 1))
return data; return data;
} }