From nobody Fri Dec 5 15:09:05 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 4dNFC52R5Tz6HyKR for ; Fri, 05 Dec 2025 15:09:05 +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 4dNFC51Z1Wz3tpN for ; Fri, 05 Dec 2025 15:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764947345; 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=PtVk9sOFJttiivQbc8zjZHK7z9Jl6TDCRrI7kaLHaDg=; b=SdOri3khm3RW9ffkSXoChTd/ighK6X799u/TSz6LycfR03mr37gyZMlh9QwISWrlyd0pgQ KUXoYGERfbXH4UQHAGAKgIAHIaudg8fyTo9k//qNFJ0OLrjWb0FRCBpE5Ux8n/5Tw1sRFd 5fAVWxT8VGPQbtmSmWtVg7y4JdzN4Vrd2E1rpDrHDhFNAaRyrTO/CwIi5ZHKXQx7ppG65v QkHRKMzzr4R4b3VX/H4yjnPt4yuTVyllyQESYOCazfdts4dMWwC4gLNEN19JmbLNRyzDa3 Q/mrDj6BagOi63KGHgcV7nn0pDILLe/1FGSpPA+ICjnyxK3RpkwCr82qC1BoMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764947345; 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=PtVk9sOFJttiivQbc8zjZHK7z9Jl6TDCRrI7kaLHaDg=; b=tOlg/dGBYRpXPc7TAp/MX4xagCRt7DbHyQQdld8LlJEukGirbAkVMrP+0jtIa/5UBwppBu 8ueQ9bdCmYguqetMj7rAsHjK4guqqBPm/U2YfGYODB0yL8z7CIctD/AxgbAAeuKB/v7s+A lWcc3qGpIbGAVhxoJzd0uEqJ/tCVR2x4ZbQIoUXgFqEikVewbgRgoZnqlSDOpeW7CvTiBy bNXPGHcRxEWjvoIQTb9fadgFitgKQ1XpGXa+GRpiOAis2VjKjiQLv8eT/KoBOp/t0sE7b7 xUxlL30BRnvhWy+pZWr3RyxmFNLZmpuyBCEESF8fptpRFFCsxAnOLDLmvTtbvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764947345; a=rsa-sha256; cv=none; b=Eb14qzr97I5Yk7fNMjEGddDYzyOgkHl2litMuoSvxRONCQkU4Ajt7GXzuajNrTXAKddFvW HoPWl0aJDTTcOHujFEZrMymFpvcAGzPCJ372bmrd2vSwc/iPkiEFD2/hasq9hbACCGxcoN 1bKYfB2iYqnKnzYTNfYofdNtWhNL/RJMjEg9EvgOBU7LE0UXuJmT02Nt3kGyfDNFCtt77M r+uEj/QSrINNDEYnlkfNI7c6vzCuNtHWXnW35zvhRG2bzgPlZTB7NYUsdPc9thmgnfIi7Z Qn6+WklTXBHGoM1xmsbjg1vAAlmfiZ783R+DcA2fAQaahAHTNVHx/l5FDhjUkg== 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 4dNFC50tqkzfC for ; Fri, 05 Dec 2025 15:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3423c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 15:09:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 844f76c2426d - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 844f76c2426d079e1fafc1babb0fc087382adfbc Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 15:09:05 +0000 Message-Id: <6932f591.3423c.42090594@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=844f76c2426d079e1fafc1babb0fc087382adfbc commit 844f76c2426d079e1fafc1babb0fc087382adfbc Author: Dag-Erling Smørgrav AuthorDate: 2025-11-26 16:54:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-05 15:08:55 +0000 libc: Simplify __get_locale() MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: fuz Differential Revision: https://reviews.freebsd.org/D53908 (cherry picked from commit 5af240c54bd2d9548536c904e841499e1651bcc8) --- 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); } /**