public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] stdio-common: Move union printf_arg int <printf.h>
@ 2022-05-24 6:51 Florian Weimer
0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2022-05-24 6:51 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=46db9783476e7e2b3f2437ec6437436443699fca
commit 46db9783476e7e2b3f2437ec6437436443699fca
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue May 24 08:03:11 2022 +0200
stdio-common: Move union printf_arg int <printf.h>
The type does not depend on wide vs narrow preprocessor macros,
so it does not need to be customized in stdio-common/printf-parse.h.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diff:
---
include/printf.h | 21 +++++++++++++++++++++
stdio-common/printf-parse.h | 23 -----------------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/include/printf.h b/include/printf.h
index fb0b71fa4c..78accaab6d 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -20,6 +20,27 @@ int __register_printf_specifier (int, printf_function,
printf_arginfo_size_function);
libc_hidden_proto (__register_printf_specifier)
+/* The various kinds of arguments that can be passed to printf. */
+union printf_arg
+ {
+ wchar_t pa_wchar;
+ int pa_int;
+ long int pa_long_int;
+ long long int pa_long_long_int;
+ unsigned int pa_u_int;
+ unsigned long int pa_u_long_int;
+ unsigned long long int pa_u_long_long_int;
+ double pa_double;
+ long double pa_long_double;
+#if __HAVE_FLOAT128_UNLIKE_LDBL
+ _Float128 pa_float128;
+#endif
+ const char *pa_string;
+ const wchar_t *pa_wstring;
+ void *pa_pointer;
+ void *pa_user;
+};
+
#include <bits/types/locale_t.h>
/* Now define the internal interfaces. */
diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h
index 362cce1ead..249f789526 100644
--- a/stdio-common/printf-parse.h
+++ b/stdio-common/printf-parse.h
@@ -44,29 +44,6 @@ struct printf_spec
int size;
};
-
-/* The various kinds off arguments that can be passed to printf. */
-union printf_arg
- {
- wchar_t pa_wchar;
- int pa_int;
- long int pa_long_int;
- long long int pa_long_long_int;
- unsigned int pa_u_int;
- unsigned long int pa_u_long_int;
- unsigned long long int pa_u_long_long_int;
- double pa_double;
- long double pa_long_double;
-#if __HAVE_FLOAT128_UNLIKE_LDBL
- _Float128 pa_float128;
-#endif
- const char *pa_string;
- const wchar_t *pa_wstring;
- void *pa_pointer;
- void *pa_user;
- };
-
-
#ifndef DONT_NEED_READ_INT
/* Read a simple integer from a string and update the string pointer.
It is assumed that the first character is a digit. */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-24 6:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-24 6:51 [glibc] stdio-common: Move union printf_arg int <printf.h> Florian Weimer
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).