From nobody Fri Dec 5 18:28:38 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 4dNKdM1MfTz6JFh9 for ; Fri, 05 Dec 2025 18:28:39 +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 4dNKdL5yn6z3SlK for ; Fri, 05 Dec 2025 18:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764959318; 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=A0ELJrZ8QfuvvDW05rf6+l6SlXtu52y1jQsOELZD6fA=; b=g4pDfGvAThKRO4m3hjxD08TqQAbU5PCU30EE6kPDmNAjutAY02IUAjBfgx2uPfXPsde8f5 xA7gzXP7ZVk+9gECaW5m6Y5xp0j8EVZgVPZ4R7vk+6/m991DnhL2kEpP3GpfpDrHP4gwX+ 9t1CPAZOhbFQ8hSX6PciUPs9artymxfwsW090G0OYPf1qNpOKZtqu+n75mpgU5CrIMtObH wmj49ECvZAxYbwyA/CPPeCmhNXBKLpowOejANzU7COhBrGqJo5NR5bla5RMMfCTq4Inaae +xdiRwtuN/rNdMbtnoeuH6b8b6OaxjgbY7QEu6kLqE5TegUuau/LxcJa7t9sOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764959318; 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=A0ELJrZ8QfuvvDW05rf6+l6SlXtu52y1jQsOELZD6fA=; b=XKrVoOkf5HNXrupsSWpT+YG92rUSr0SIz8CjxL6H2ZjOhR18gejI0Q/oIs1I/L/3Jlrq2M SoFZFl3h8ZDjK0qlrtER2utWUxwiRjs4xXBH3tlDApoEzdWC1Wj0hXv1NJ1gBsV2wAsoOW Sp/3A7UbDGX4MBOf0VsIkxVbtq0hpHjN6VyxrXYUAptEjw7jxPwKSzk/+r/drFRDFqKl0+ pcVmeRfslj88QqgB+cBIfKgvNbDtwAYP+TcRDOEJYLfqmEXsdlQJmaRGk3T8RwQaUimmpC Fx1+EaxU8d8VCudfK5qNDrUFTQ9wEJURvXCAh2pKGZ7daM6iiCHW/gF5vFIS4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764959318; a=rsa-sha256; cv=none; b=bXgwy0jkaWENVP6XntZCphwEAv5T2oALqNN3nNl4gCi3W6BxgM+1y48GHxtgyDBzsBfBwp yTPqKRWXLpbo0boHPKwgYRw9fPqcIWXHf/GgK+fYGZWn9QIsIuj5jr6UuhJCcUk/+Ch8TL /biDWmO9NDEy0K57mIWmiaRC18aFeWp3yqSgTscmcUUzA2WF8Sy1f7YxzzkbVQ2dlpq3P1 N7NEqEx7zjYAZggLk7gkUqdiZlL1au8i6kviq6XOaaC+RgKjeCeAC3Faky0WmwCp6C815+ fyo83ZJxr/NSXQe9N1fvAOwdDFQI0TrA8a4tRPOovUxR7DA3BZHVhF7kkUmrUg== 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 4dNKdL5GqLz5jV for ; Fri, 05 Dec 2025 18:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cb7d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 18:28:38 +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: 8787b699b036 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 8787b699b036bdd99ee42a98577a7a291da9ab91 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 18:28:38 +0000 Message-Id: <69332456.cb7d.4edc73bd@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8787b699b036bdd99ee42a98577a7a291da9ab91 commit 8787b699b036bdd99ee42a98577a7a291da9ab91 Author: Dag-Erling Smørgrav AuthorDate: 2025-11-26 16:54:52 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-12-05 10:58:57 +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); } /**