From: Alexandre Oliva <aoliva@redhat.com>
Date: Thu, 26 Feb 2015 05:46:02 +0000 (-0300)
Subject: Fix constness error just introduced in findlocale.
X-Git-Tag: glibc-2.22~543
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23d43090e0b275e47e09e859823e965a1eb323dc;p=thirdparty%2Fglibc.git

Fix constness error just introduced in findlocale.

for  ChangeLog

	[BZ #15969]
	* locale/findlocale.c (_nl_find_locale): Fix constness error in
	the previous change.
---

diff --git a/ChangeLog b/ChangeLog
index 0d7cf377acd..4fbd3407643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-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]
 	* locale/findlocale.c (_nl_find_locale): Retry archive search
diff --git a/locale/findlocale.c b/locale/findlocale.c
index 360f58b904d..5e2639b87bb 100644
--- a/locale/findlocale.c
+++ b/locale/findlocale.c
@@ -161,7 +161,8 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
       loc_name = (char *) _nl_expand_alias (*name);
       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))
 	    return data;
 	}