summaryrefslogtreecommitdiff
path: root/stdio-common/printf-prs.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2023-06-19 18:52:12 +0000
committerJoseph Myers <joseph@codesourcery.com>2023-06-19 18:52:12 +0000
commit5f83b2674e42cd74257731b281f66d0442bf045f (patch)
treecb4d3f19d481d718c4800218f20afc93441199e3 /stdio-common/printf-prs.c
parent8022fc7d5119a22e9e0ac72798f649385b0e167a (diff)
downloadglibc-5f83b2674e42cd74257731b281f66d0442bf045f.tar
glibc-5f83b2674e42cd74257731b281f66d0442bf045f.tar.gz
glibc-5f83b2674e42cd74257731b281f66d0442bf045f.tar.bz2
glibc-5f83b2674e42cd74257731b281f66d0442bf045f.zip
C2x printf %wN, %wfN support (bug 24466)
ISO C2x defines printf length modifiers wN (for intN_t / int_leastN_t / uintN_t / uint_leastN_t) and wfN (for int_fastN_t / uint_fastN_t). Add support for those length modifiers (such a feature was previously requested in bug 24466). scanf support is to be added separately. GCC 13 has format checking support for these modifiers. When used with the support for registering format specifiers, these modifiers are translated to existing flags in struct printf_info, rather than trying to add some way of distinguishing them without breaking the printf_info ABI. C2x requires an error to be returned for unsupported values of N; this is implemented for printf-family functions, but the parse_printf_format interface doesn't support error returns, so such an error gets discarded by that function. Tested for x86_64 and x86.
Diffstat (limited to 'stdio-common/printf-prs.c')
-rw-r--r--stdio-common/printf-prs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index 2408a2e328..9d8bf306e4 100644
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -63,6 +63,7 @@ parse_printf_format (const char *fmt, size_t n, int *argtypes)
size_t max_ref_arg; /* Highest index used in a positional arg. */
struct printf_spec spec;
const unsigned char *f = (const unsigned char *) fmt;
+ bool failed;
nargs = 0;
max_ref_arg = 0;
@@ -71,7 +72,7 @@ parse_printf_format (const char *fmt, size_t n, int *argtypes)
for (f = __find_specmb (f); *f != '\0'; f = spec.next_fmt)
{
/* Parse this spec. */
- nargs += __parse_one_specmb (f, nargs, &spec, &max_ref_arg);
+ nargs += __parse_one_specmb (f, nargs, &spec, &max_ref_arg, &failed);
/* If the width is determined by an argument, it is an int. */
if (spec.width_arg != -1 && (size_t) spec.width_arg < n)