From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH v4 04/11] stdio-common: Add __translated_number_width
Date: Thu, 18 Aug 2022 10:54:40 +0200 [thread overview]
Message-ID: <32b4f565ef07fff6dafbd4584f0d480fa478f5e7.1660812721.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1660812721.git.fweimer@redhat.com>
This function will be used to compute the width of a number
after i18n digit translation.
---
include/printf.h | 13 +++++++-
stdio-common/Makefile | 1 +
stdio-common/translated_number_width.c | 42 ++++++++++++++++++++++++++
3 files changed, 55 insertions(+), 1 deletion(-)
create mode 100644 stdio-common/translated_number_width.c
diff --git a/include/printf.h b/include/printf.h
index 8f064149d3..5127a45f9b 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -53,7 +53,18 @@ int __wprintf_function_invoke (void *, printf_function callback,
#include <bits/types/locale_t.h>
-/* Now define the internal interfaces. */
+/* Returns the width (as for printf, in bytes) of the converted ASCII
+ number in the characters in the range [FIRST, LAST). The range
+ must only contain ASCII digits. The caller is responsible for
+ avoiding overflow.
+
+ This function is used during non-wide digit translation. Wide
+ digit translate produces one wide character per ASCII digit,
+ so the width is simply LAST - FIRST. */
+int __translated_number_width (locale_t loc,
+ const char *first, const char *last)
+ attribute_hidden;
+
extern int __printf_fphex (FILE *, const struct printf_info *,
const void *const *) attribute_hidden;
extern int __printf_fp (FILE *, const struct printf_info *,
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 9195b209cd..902b8e9db3 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -85,6 +85,7 @@ routines := \
tmpfile64 \
tmpnam \
tmpnam_r \
+ translated_number_width \
vfprintf \
vfprintf-internal \
vfscanf \
diff --git a/stdio-common/translated_number_width.c b/stdio-common/translated_number_width.c
new file mode 100644
index 0000000000..f42d5968a1
--- /dev/null
+++ b/stdio-common/translated_number_width.c
@@ -0,0 +1,42 @@
+/* Compute the printf width of a sequence of ASCII digits.
+ Copyright (C) 2022 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <assert.h>
+#include <limits.h>
+#include <locale/localeinfo.h>
+#include <printf.h>
+
+int
+__translated_number_width (locale_t loc, const char *first, const char *last)
+{
+ struct lc_ctype_data *ctype = loc->__locales[LC_CTYPE]->private;
+
+ if (ctype->outdigit_bytes_all_equal > 0)
+ return (last - first) * ctype->outdigit_bytes_all_equal;
+ else
+ {
+ /* Digits have varying length, so the fast path cannot be used. */
+ int digits = 0;
+ for (const char *p = first; p < last; ++p)
+ {
+ assert ('0' <= *p && *p <= '9');
+ digits += ctype->outdigit_bytes[*p - '0'];
+ }
+ return digits;
+ }
+}
--
2.37.1
next prev parent reply other threads:[~2022-08-18 8:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-18 8:53 [PATCH v4 00/11] vfprintf refactor Florian Weimer
2022-08-18 8:53 ` [PATCH v4 01/11] locale: Implement struct grouping_iterator Florian Weimer
2022-08-18 8:54 ` [PATCH v4 02/11] stdio-common: Introduce buffers for implementing printf Florian Weimer
2022-08-18 8:54 ` [PATCH v4 03/11] stdio-common: Add __printf_function_invoke Florian Weimer
2022-08-18 8:54 ` Florian Weimer [this message]
2022-08-18 8:54 ` [PATCH v4 05/11] stdio-common: Convert vfprintf and related functions to buffers Florian Weimer
2022-08-18 8:54 ` [PATCH v4 06/11] stdio-common: Add lock optimization to vfprintf and vfwprintf Florian Weimer
2022-08-18 8:54 ` [PATCH v4 07/11] libio: Convert __vsprintf_internal to buffers Florian Weimer
2022-08-18 8:54 ` [PATCH v4 08/11] libio: Convert __vasprintf_internal " Florian Weimer
2022-08-18 8:55 ` [PATCH v4 09/11] libio: Convert __vdprintf_internal " Florian Weimer
2022-08-18 8:55 ` [PATCH v4 10/11] libio: Convert __obstack_vprintf_internal to buffers (bug 27124) Florian Weimer
2022-08-18 8:55 ` [PATCH v4 11/11] libio: Convert __vswprintf_internal to buffers (bug 27857) Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=32b4f565ef07fff6dafbd4584f0d480fa478f5e7.1660812721.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).