From nobody Tue Jan 31 00:39:11 2023 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 4P5R4v2tWSz3bt9h; Tue, 31 Jan 2023 00:39:11 +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 4P5R4v2Fmdz4WXT; Tue, 31 Jan 2023 00:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675125551; 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=3plkugU7IvX1z/HhJ9d15A1hhLBwntMg3KsJJIuq6/I=; b=mM1xj5r7PhgrGMwBaxVU+BmGlfLKL7cPQnVer4yJeDy3KGqgDNdPc4JnMJ4h/4lMXdP04I PYWESAOPLDdBd3aasLqvw82OGs51rbA+EvLO7h264O4BfoXrtBhjwhx/OVaaBP1vC3jO5L Xl3EUuyBXlQa4e5sz601lhFoQQ3vsYLapkUJwPq03l0Pd8WtcBuHdBBJRjhzt9e90oYn4p nquvla7RZ/Tsbjrm2gcVYJ0JlxVdebvvNd8P9jmd0JPk6tSIpyVzjxvhqMP797gJkumgFc NF4gCY8XD9ydFxgRsgBlNo5Oa9tYtmSpVtWbsGf6Cl8QtZ+YfKpAjavUhYEXWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675125551; 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=3plkugU7IvX1z/HhJ9d15A1hhLBwntMg3KsJJIuq6/I=; b=wyYzqfQyvHsCnCcPcBUU0hhCXneXAcOubIQM1LSfPqHrPR7BbpKZ8xuk/NgCKg6zuwpt1f PXMcVNP0Nq+gLgjRhIo5rqo7dm4YGpi7v/aVEGAlHsq7Uv3QRWKHAGKjnEB2CvehX0ad/k y9kCd/e9GgGRxj6/RlwHarneSiIzpDvZ8M6AERYKfEatwc7IBO+oGzcJ+U3WUoKTG4hXN4 3Yju8s23VbqccPFXEBQMIjC7sV3aSl/JOuUPK6HVTmC5OEIqcug/AeYgnCXlyaJO9hT4bg qKQU+vIEJ+M8OwP6m63QPWhMTFIy1qKDozwweZU/x9hqqEbN6spjHH0l+qf86Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675125551; a=rsa-sha256; cv=none; b=QkR7RMtfjaIxpzpw/CpBCrHOuFEy6yK2Nm+hMzV/fpV/X4XfS80tzHeNnbgvPyXV7hsSIt w2KAvCuh9ilYLX6eSfOmvfrjJhwwKqviCHGiTzV968Atjxqz9T0ipiPbKD08kG4Pw/oL/1 vzh31StdME8MYX8cFMmUQp8wDRG/phIm6FMhcQZT1kiB+zbrrvrYskHD+ssT9/8ACJrVAo yCcCWlvN42cN+zfb5jo0675xK40DqaIq6+Ix+r4S5EV7MsMoNONtYeCq0dSRppN6j6Dh7M ICE63sPCxjBpmDg2Q9snYhD9HxwGlcGD9IMKbBYDoI0zAWmMjf1oLX51bXPT/A== 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 4P5R4v1LMgzTy1; Tue, 31 Jan 2023 00:39:11 +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 30V0dBUj059601; Tue, 31 Jan 2023 00:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V0dBn0059600; Tue, 31 Jan 2023 00:39:11 GMT (envelope-from git) Date: Tue, 31 Jan 2023 00:39:11 GMT Message-Id: <202301310039.30V0dBn0059600@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: 4e1231260731 - stable/13 - strfmon(3): Wording improvements 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: 4e1231260731067a5bba2bcbd92cca8b4f78152a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4e1231260731067a5bba2bcbd92cca8b4f78152a commit 4e1231260731067a5bba2bcbd92cca8b4f78152a Author: Jose Luis Duran AuthorDate: 2022-11-08 20:53:17 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-31 00:38:19 +0000 strfmon(3): Wording improvements (cherry picked from commit 59cc636d94a6c9b28147304fa59351224f801e92) --- lib/libc/stdlib/strfmon.3 | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3 index 1ddfb77cb0ac..5c110a8987dc 100644 --- a/lib/libc/stdlib/strfmon.3 +++ b/lib/libc/stdlib/strfmon.3 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 28, 2022 +.Dd January 25, 2023 .Dt STRFMON 3 .Os .Sh NAME @@ -37,13 +37,15 @@ .In monetary.h .Ft ssize_t .Fn strfmon "char * restrict s" "size_t maxsize" "const char * restrict format" "..." +.In monetary.h +.In xlocale.h .Ft ssize_t .Fn strfmon_l "char * restrict s" "size_t maxsize" "locale_t loc" "const char * restrict format" "..." .Sh DESCRIPTION The .Fn strfmon function places characters into the array pointed to by -.Fa s +.Fa s , as controlled by the string pointed to by .Fa format . No more than @@ -52,9 +54,9 @@ bytes are placed into the array. .Pp The .Fn strfmon_l -function does the same as +function takes an explicit locale argument, whereas the .Fn strfmon -but takes an explicit locale rather than using the current locale. +function uses the current global or per-thread locale. .Pp The format string is composed of zero or more directives: ordinary characters (not @@ -129,12 +131,14 @@ character is written. .El .El .Sh RETURN VALUES -If the total number of resulting bytes including the terminating +If the total number of resulting bytes, including the terminating .Dv NUL -byte is not more than +byte, is not more than .Fa maxsize , .Fn strfmon -returns the number of bytes placed into the array pointed to by +and +.Fn strfmon_l +return the number of bytes placed into the array pointed to by .Fa s , not including the terminating .Dv NUL @@ -144,11 +148,6 @@ the contents of the array are indeterminate, and .Va errno is set to indicate the error. -.Pp -The -.Fn strfmon_l -function returns the same values as -.Fn strfmon . .Sh EXAMPLES The following example will format the value .Dq Li 1234567.89