From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 1D647385625F; Tue, 24 May 2022 06:51:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D647385625F Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] stdio-common: Move union printf_arg int X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 800d535504c06f16726f2add8602ee9a36baf808 X-Git-Newrev: 46db9783476e7e2b3f2437ec6437436443699fca Message-Id: <20220524065121.1D647385625F@sourceware.org> Date: Tue, 24 May 2022 06:51:21 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2022 06:51:21 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=46db9783476e7e2b3f2437ec6437436443699fca commit 46db9783476e7e2b3f2437ec6437436443699fca Author: Florian Weimer Date: Tue May 24 08:03:11 2022 +0200 stdio-common: Move union printf_arg int 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 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 /* 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. */