From nobody Wed Feb 09 00:48:16 2022 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 A7E6E19B7806; Wed, 9 Feb 2022 00:48:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jth7k3ZJCz4tSN; Wed, 9 Feb 2022 00:48:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367700; 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=Tq5ZgOqBNzExQcRUnHvNNB09zUkEBs8faw1WmGZ3DNA=; b=Yu8x3ifC8QZAZk5TlIoxYNvpjr2Wwx4kLCgnJMOaMF+8tUe4HG2q9qAufjEUaTxbyKTtZQ sLfhDtV/4nlHtO9b3x4c1VK7GnLzHUdU+wGqVeX49cNfEIKnbXwpTXXwxXKtqKHu7TtYIc IYGbqoGATDSxpKuRn0xYt2/mCrEExq7vamUXWmB3291XRJO/apUYk4i6k3J3jVLQhMKiJM kElHFZv9kmeAY0DUfns7apwj/QvxwwOBF1B8BdXjgLBrSusTgGY0Mw7U9rR46lTb+dD6+q e2PZ/KCiWClaH81XJcAEafeGS5LzVwg0Voql12gDCe0xPM3ZBBowy0lVru30ZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D053F23834; Wed, 9 Feb 2022 00:48:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2190mGPJ083928; Wed, 9 Feb 2022 00:48:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2190mGMl083927; Wed, 9 Feb 2022 00:48:16 GMT (envelope-from git) Date: Wed, 9 Feb 2022 00:48:16 GMT Message-Id: <202202090048.2190mGMl083927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0c60f03d83e8 - stable/13 - libc/locale/lnumeric.c: minor style 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0c60f03d83e80d155d569b2156dc1cb7b5c9d358 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644367699; 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=Tq5ZgOqBNzExQcRUnHvNNB09zUkEBs8faw1WmGZ3DNA=; b=JO1FMVxVKGnqFkcRK9DF89kgqDk8dD4OFfAs0Uh5AjYpgaLCSxkswybVhBasEsNYwwsXRO pHWcTf3dPFXUfivQDOaLf83p9lBYXQygv/pTQ/r8lwY3+YJseaMM1hIJF0OeIvqwr6ruc7 4ZiwiNKAdDvuz6W3YmheeMS2LK7loXmnuf3zJnSs1YIEuNpQO7hppOam0yGDZM9VJ9GNkm qSI+MbRf6fHeSvjtVX2OfH1RVhdqg6a6m/3lCeMkAm7WDsfKmRdtdmOxi4+HAHRBdHOJqe eNfc9sQ6iS9Om29IMA9fCcFIFTWe3wZ2rynhEEqeRwLm0Q6tGj3Ma2I0mv+87A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644367699; a=rsa-sha256; cv=none; b=bwaaRhEazJfl6tY8FU+rl4/xfN0rpoirtJEOwl1rTzWX+3dM0p952+hwRxQ2GxYqVS2m6y xFhTE/M2nV4iZZaWbrLo4Q34uhObzO0nO7zseAek0n+AhExg13foxe3E8Jgtf30ZOe4zz3 KfI/oSo9S1jQvAfabjWKj80Lh+2QGSIygX4R6R+Ybuvtok10y26O5lZQrwXsHqkLDlX8Gd S2yhyMfKvM2Eq1N8FazTj1rJcG8VmmwCuHFDy3yggSvrfYBMKAXbog7tMdxWJQrkuA2XRV qoyBQKaGwhZgbHmjTlZxRpZUsCwjLQvsT9zlsMrAutQVPnlDPx/nXIsDvg+uzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0c60f03d83e80d155d569b2156dc1cb7b5c9d358 commit 0c60f03d83e80d155d569b2156dc1cb7b5c9d358 Author: Konstantin Belousov AuthorDate: 2022-02-02 18:15:34 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-09 00:42:46 +0000 libc/locale/lnumeric.c: minor style (cherry picked from commit 1aa669c5f9c233989204de96e0557459378e85bc) --- lib/libc/locale/lnumeric.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c index 046d1f1817dc..d7305505fa65 100644 --- a/lib/libc/locale/lnumeric.c +++ b/lib/libc/locale/lnumeric.c @@ -63,16 +63,16 @@ destruct_numeric(void *v) struct xlocale_numeric __xlocale_global_numeric; static int -numeric_load_locale(struct xlocale_numeric *loc, int *using_locale, int *changed, - const char *name) +numeric_load_locale(struct xlocale_numeric *loc, int *using_locale, + int *changed, const char *name) { int ret; struct lc_numeric_T *l = &loc->locale; ret = __part_load_locale(name, using_locale, - &loc->buffer, "LC_NUMERIC", - LCNUMERIC_SIZE, LCNUMERIC_SIZE, - (const char**)l); + &loc->buffer, "LC_NUMERIC", + LCNUMERIC_SIZE, LCNUMERIC_SIZE, + (const char**)l); if (ret != _LDP_ERROR) *changed= 1; if (ret == _LDP_LOADED) { @@ -89,30 +89,31 @@ numeric_load_locale(struct xlocale_numeric *loc, int *using_locale, int *changed int __numeric_load_locale(const char *name) { - return numeric_load_locale(&__xlocale_global_numeric, - &__xlocale_global_locale.using_numeric_locale, - &__xlocale_global_locale.numeric_locale_changed, name); + return (numeric_load_locale(&__xlocale_global_numeric, + &__xlocale_global_locale.using_numeric_locale, + &__xlocale_global_locale.numeric_locale_changed, name)); } + void * __numeric_load(const char *name, locale_t l) { - struct xlocale_numeric *new = calloc(sizeof(struct xlocale_numeric), 1); + struct xlocale_numeric *new = calloc(sizeof(struct xlocale_numeric), + 1); new->header.header.destructor = destruct_numeric; if (numeric_load_locale(new, &l->using_numeric_locale, - &l->numeric_locale_changed, name) == _LDP_ERROR) - { + &l->numeric_locale_changed, name) == _LDP_ERROR) { xlocale_release(new); - return NULL; + return (NULL); } - return new; + return (new); } struct lc_numeric_T * __get_current_numeric_locale(locale_t loc) { - return (loc->using_numeric_locale - ? &((struct xlocale_numeric *)loc->components[XLC_NUMERIC])->locale - : (struct lc_numeric_T *)&_C_numeric_locale); + return (loc->using_numeric_locale ? + &((struct xlocale_numeric *)loc->components[XLC_NUMERIC])->locale : + (struct lc_numeric_T *)&_C_numeric_locale); } #ifdef LOCALE_DEBUG