From patchwork Thu Feb 26 05:52:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 5301 Received: (qmail 93950 invoked by alias); 26 Feb 2015 05:56:32 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 93937 invoked by uid 89); 26 Feb 2015 05:56:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com From: Alexandre Oliva To: "Carlos O'Donell" Cc: Roland McGrath , libc-alpha@sourceware.org Subject: Re: search locale archive again after alias expansion References: <20130918220004.B23492C09F@topped-with-meat.com> <54E796D1.40502@redhat.com> Date: Thu, 26 Feb 2015 02:52:00 -0300 In-Reply-To: <54E796D1.40502@redhat.com> (Carlos O'Donell's message of "Fri, 20 Feb 2015 15:19:29 -0500") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 On Feb 20, 2015, "Carlos O'Donell" wrote: >> for ChangeLog >> >> [BZ #15969] >> * locale/findlocale.c (_nl_find_locale): Retry archive search >> after alias expansion. >> * NEWS: Updated. > OK to checkin. I did, and then my dtv-fix build failed due to a missing const typecast in the patch above. I didn't check whether the prototype of _nl_load_locale_from_archive changed so as to require a const char **, or whether this is a result of the warning tightening, but I'm putting in this amendment for now, while I test a more adequade fix. [BZ #15969] * locale/findlocale.c (_nl_find_locale): Fix constness error in the previous change. diff --git a/locale/findlocale.c b/locale/findlocale.c index 360f58b..5e2639b 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; }