mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

stdio-common: Move union printf_arg int <printf.h>

Browse Source 
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>
This commit is contained in:
Florian Weimer 2022-05-24 08:03:11 +02:00
parent 800d535504
commit 46db978347
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/printf.h
View File

@ -20,6 +20,27 @@ int __register_printf_specifier (int, printf_function,
printf_arginfo_size_function); printf_arginfo_size_function);
libc_hidden_proto (__register_printf_specifier) 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> #include <bits/types/locale_t.h>
/* Now define the internal interfaces. */ /* Now define the internal interfaces. */

23
stdio-common/printf-parse.h
View File

@ -44,29 +44,6 @@ struct printf_spec
int size; 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 #ifndef DONT_NEED_READ_INT
/* Read a simple integer from a string and update the string pointer. /* Read a simple integer from a string and update the string pointer.
It is assumed that the first character is a digit. */ It is assumed that the first character is a digit. */