From nobody Tue Nov 01 00:46:35 2022 X-Original-To: dev-commits-src-branches@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 4N1WYR2mZfz4gy9b; Tue, 1 Nov 2022 00:46:35 +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 4N1WYR24czz3RFW; Tue, 1 Nov 2022 00:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667263595; 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=fPEKGdiyfJXGEz6LYXyRS3pYYdT5kLitIj36cwRMTjw=; b=YtWvSTCS51YP9Ix8ecmi7vJdhP6YzSApmikPZ+O+32VYdMMVs9+fieXhLQ/xeswRt/CEPc b1Z/zfWmNs6LXUskkxGHmi4VTytjLNDrqYpZck7TocO4GhHRJ/bwRi3PyO6/pUC42GBSyu Vr6DoYiBHrBThj7bcX+EPBH5DSgISD590uWtGETiiQCTDpOSLdZaidX02sKdda8WrjDryR ZDICyD8rnJHqrdhA2U8GIg2VDB6y7hjYhaRuVqq0GwgAhyNgRE10yIPw5B8WlOVqKqXOUy CKypf8ec/XnpjuiRQYjcKGbVJvc4ieerzTYuClyYLXgPSGWJurUBg5ZQgMulLw== 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 4N1WYR1BHmzwmf; Tue, 1 Nov 2022 00:46:35 +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 2A10kZZC042114; Tue, 1 Nov 2022 00:46:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A10kZNV042113; Tue, 1 Nov 2022 00:46:35 GMT (envelope-from git) Date: Tue, 1 Nov 2022 00:46:35 GMT Message-Id: <202211010046.2A10kZNV042113@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: 81e14c8f16bb - stable/13 - strfmon: Fix formatting of a second fixed-width value List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 81e14c8f16bb4545a5fc0549b05d9325010dbddd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667263595; 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=fPEKGdiyfJXGEz6LYXyRS3pYYdT5kLitIj36cwRMTjw=; b=o50bR50cmyfjWoSv/V14wIN5iEFGHARXblGHEMiJFc12N94LsKFkmr9rtM70QesigI5awI ehpjd3DOvlokJBtzB2VCbB+MLyesH44tIeRWSFsqyfPAxOD93AFcLdqontq72QTrMiW5gc zALxFtFVwiO8Vso499Rm4CpdMUStYzD9HY7D5ZHvJINv3A8snlfPYNEUsmJJXRs8V8ibkt h5k6EKkWGSAgZ9HDn2EQ2lNsojYlQRSw5rrKfecZ9QHtfURqevphR3C9A4XlgVj9BSr7UO menOyDppsiclbclnNxuQbf1R2Dh3NJ53ZT9fEzRwv9+Z6xm2wFjFH4bZfDK86g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667263595; a=rsa-sha256; cv=none; b=gwfy4wJgJu/AIoUCPe2R2F1k5NuNdLEE5IV6XQ/G41io9ASyOzE8muNshuoNduVTBUQZpC NeLRyHzV6DThxdxd5aCRklhJd3oVDW6k29DmhwVydGPU9FYH3jNVzBcY7LWGVWi3YcJ5Fj wK+CWSnuX9bbmFJBf6bkRKMgRwPUlM4U8Srio2f8+90xjlfx/+dvNUZ5nx3RL+utpRa0im zbNhpletywo232rim57sJw/9a1oSpZt1iuLMiYJgXxynoaARL+5XxWBKI9TICxrboXTifV r1AqBcH43CQwgwnoYEMwSAGtelew5mwc+gyP+oWnDxhniSOzlJLaD9PgSHWOag== 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=81e14c8f16bb4545a5fc0549b05d9325010dbddd commit 81e14c8f16bb4545a5fc0549b05d9325010dbddd Author: Jose Luis Duran AuthorDate: 2022-10-21 19:34:09 +0000 Commit: Konstantin Belousov CommitDate: 2022-11-01 00:44:41 +0000 strfmon: Fix formatting of a second fixed-width value (cherry picked from commit 34f88528edba44b2703ba8c772bef077eca33dab) --- lib/libc/stdlib/strfmon.c | 2 +- lib/libc/tests/stdlib/strfmon_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c index d3266fe52ed5..5436bd6ec78e 100644 --- a/lib/libc/stdlib/strfmon.c +++ b/lib/libc/stdlib/strfmon.c @@ -135,7 +135,6 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, fmt = format; asciivalue = NULL; currency_symbol = NULL; - pad_size = 0; while (*fmt) { /* pass nonformating characters AS IS */ @@ -155,6 +154,7 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc, /* set up initial values */ flags = (NEED_GROUPING|LOCALE_POSN); pad_char = ' '; /* padding character is "space" */ + pad_size = 0; /* no padding initially */ left_prec = -1; /* no left precision specified */ right_prec = -1; /* no right precision specified */ width = -1; /* no width specified */ diff --git a/lib/libc/tests/stdlib/strfmon_test.c b/lib/libc/tests/stdlib/strfmon_test.c index 664d1811dc46..d8e4f478547a 100644 --- a/lib/libc/tests/stdlib/strfmon_test.c +++ b/lib/libc/tests/stdlib/strfmon_test.c @@ -74,7 +74,7 @@ ATF_TC_BODY(strfmon_examples, tc) const char *expected; } tests[] = { { "%n", "[$123.45] [-$123.45] [$3,456.78]" }, - { "%11n", "[ $123.45] [ -$123.45] [ $3,456.78]" }, /* XXX */ + { "%11n", "[ $123.45] [ -$123.45] [ $3,456.78]" }, { "%#5n", "[ $ 123.45] [-$ 123.45] [ $ 3,456.78]" }, { "%=*#5n", "[ $***123.45] [-$***123.45] [ $*3,456.78]" }, { "%=0#5n", "[ $000123.45] [-$000123.45] [ $03,456.78]" },