From nobody Wed Nov 26 16:56:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dGm1V0HCcz6JKTt for ; Wed, 26 Nov 2025 16:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dGm1T6fLNz3k45 for ; Wed, 26 Nov 2025 16:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764176206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5JhJKeT32p1xHMmsfXWbSD4l9RC83MVMtnQE1xde98o=; b=rcaLm3KIATCpEKsnO4usC1oDeypsQq/ziowuJJeND74c1Ip9SdKswyqQy761FS1J8Zl1Y4 ueHVa7dB3BGO3ljNV5mC3hN41iA02Ty+S0q7tqAIb1so6MhHCPDxXSjWhtxwGrgLwTmnCl NfrlIvTTIbbvDntTjc290XekJcdxfJyc7SYkMDiLq7pYvGkzvsBH5j0uXKe1avWww9MDvu Dl7Jnvsxv2I07NIDjT18pe50xPKOF6ldVPVX5lVCv8Nn633UngPusbyq0yAaTtCyn63+Uj 1SfAnBcbahTB+y9uqX8k0WdoMLnQ0ewZDC/boWrQsqESBarwGfXWJ5MZfx0IjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764176206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5JhJKeT32p1xHMmsfXWbSD4l9RC83MVMtnQE1xde98o=; b=QkYgdZdA/rislJiH4EcgpT+MtS2/2nCLGrXm/Zk4nMIw8JM5MZUVeNNKrXhf2Y0+Xljd+t gGONNqWIHvmE6v8MgbYf9KEsxpoYzzzfke6FHWZHIndz4HVZJrSfCUbKHKE2Xnfik1wAWt kdT19z+1jsLSamQFlFLPChlxdPmBjy9YXD4N9f3f/fHe9GlZ7pIIQljGPz/oKkqgutVIbQ pEDvYp0M97ET9d8voeQsDSUgHZ9auKBrfRz17N9GOqw8QpekQidHuPlIuZy/qpQUe9NC2x gkPz2STqo/vK98M+KuFPHYYS7sf+5G6EYJrIqLw0n1ObJseP9XweG880y0rfEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764176206; a=rsa-sha256; cv=none; b=OnN9u3EX4RSrU2ATylaKLXD8bHA8Xqptp6cyUYHB8S/SeFKC7OOpP6Jnb5NbxZIgk29M2d VXQ/9ga4fa+vbP7MoOFX54PuOaN90T/b2PoMcvTvT5T300BLaCGWdfkKYQoysGch+Zt+zK coLDcoejCUReWz4iizyHBFxV7h8twSPmdCR1lPHIQ1q6H2GIGlfTHPN7hATgKIVWtTRu9R rEj2HGb5JAGA3vMf7iHvEtlZc90HafzFIOk7WD+TxhEIwldrMB2AqWNj5TbiPphAq29CTD /UaATjwA0zsXfMfhJLla2SdXplW9AVGY/eGEjfgPDq6v8XOFjvgFeQLh5cfLCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dGm1T69FlzvyH for ; Wed, 26 Nov 2025 16:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9b88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 16:56:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5af240c54bd2 - main - libc: Simplify __get_locale() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5af240c54bd2d9548536c904e841499e1651bcc8 Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 16:56:45 +0000 Message-Id: <6927314d.9b88.a55612e@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5af240c54bd2d9548536c904e841499e1651bcc8 commit 5af240c54bd2d9548536c904e841499e1651bcc8 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-26 16:54:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-26 16:56:42 +0000 libc: Simplify __get_locale() MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: fuz Differential Revision: https://reviews.freebsd.org/D53908 --- lib/libc/locale/xlocale_private.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libc/locale/xlocale_private.h b/lib/libc/locale/xlocale_private.h index ef1a8687a376..4cb323d5fa4c 100644 --- a/lib/libc/locale/xlocale_private.h +++ b/lib/libc/locale/xlocale_private.h @@ -200,11 +200,9 @@ extern _Thread_local locale_t __thread_locale; */ static inline locale_t __get_locale(void) { - - if (!__has_thread_locale) { + if (!__has_thread_locale || __thread_locale == NULL) return (&__xlocale_global_locale); - } - return (__thread_locale ? __thread_locale : &__xlocale_global_locale); + return (__thread_locale); } /**