From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 52F69385DC3B for ; Thu, 17 Mar 2022 19:30:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 52F69385DC3B Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-287-7vpLgwQPPFKoaagOU3UhxQ-1; Thu, 17 Mar 2022 15:30:24 -0400 X-MC-Unique: 7vpLgwQPPFKoaagOU3UhxQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 42F511C068D6 for ; Thu, 17 Mar 2022 19:30:24 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.88]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B38D5112C085 for ; Thu, 17 Mar 2022 19:30:23 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 12/26] locale: Call _nl_unload_locale from _nl_archive_subfreeres In-Reply-To: References: X-From-Line: 05452722425a257388ffa897973be6c1bb1d24c8 Mon Sep 17 00:00:00 2001 Message-Id: <05452722425a257388ffa897973be6c1bb1d24c8.1647544751.git.fweimer@redhat.com> Date: Thu, 17 Mar 2022 20:30:21 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Mar 2022 19:30:27 -0000 The function performs the same teps for ld_archive locales (mapped from an archive), and this code is not performance-critical, so the specialization does not add vale. --- locale/loadarchive.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/locale/loadarchive.c b/locale/loadarchive.c index e7c797bc70..5a2356707f 100644 --- a/locale/loadarchive.c +++ b/locale/loadarchive.c @@ -515,13 +515,7 @@ _nl_archive_subfreeres (void) free (dead->name); for (category = 0; category < __LC_LAST; ++category) if (category != LC_ALL && dead->data[category] != NULL) - { - /* _nl_unload_locale just does this free for the archive case. */ - if (dead->data[category]->private.cleanup) - (*dead->data[category]->private.cleanup) (dead->data[category]); - - free (dead->data[category]); - } + _nl_unload_locale (dead->data[category]); free (dead); } archloaded = NULL; -- 2.35.1