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: 443796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7BD1614007D for ; Thu, 26 Feb 2015 16:56:39 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=sourceware.org header.i=@sourceware.org header.b=s+PCnfLJ; dkim-adsp=none (unprotected policy); dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; q=dns; s=default; b=Krv/i chfqL9HSC+MS91peH5ZFGyy9UYMyapWDtRyPWJuR07claSNIebZeLVC4OUXHqaSi kj3j8U1giNf8bDYmb94lXz74YaBnODliEYlYMsRQhYLhQcyUTtI8ouKlClvAzmfu GQ7iBa2Z+CS+T0JXct5WknOASuptt6B31ffVRM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=default; bh=DJpjFvovd0B iNbLXtqhNVFxiFc4=; b=s+PCnfLJOoupWrlUqgoZQhU4WEW67CCNsbhShR8MfAc MlTDwRa/kznrTh46O2+OZ8t72RKvZKxzAoEo4XKRA/DE2PK2wU2SWZxc6CLmhH/J Xfi0ZkG21zS8FnCwlWQ/N0nNo6npobvw8Qelcii0apnhnt5robKoR2K+bS+c9hPw = 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; }