[v3,03/16] sysdeps: Ensure ieee128*_chk routines to be properly named
Checks
| Context |
Check |
Description |
| redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
The *_chk routines naming doesn't match the name that would be generated
using libc_hidden_ldbl_proto. Since the macro is needed for some of
these *_chk functions for _FORTIFY_SOURCE to be enabled, that needed to
be fixed.
While at it, all the *_chk function get renamed appropriately for
consistency, even if not strictly necessary.
---
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-swprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c | 8 ++++----
.../ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c | 4 ++--
.../ieee754/ldbl-128ibm-compat/ieee128-vfwprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c | 4 ++--
.../ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c | 4 ++--
.../ieee754/ldbl-128ibm-compat/ieee128-vswprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c | 4 ++--
sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c | 4 ++--
19 files changed, 40 insertions(+), 40 deletions(-)
Comments
On 2023-06-28 04:42, Frédéric Bérat wrote:
> The *_chk routines naming doesn't match the name that would be generated
> using libc_hidden_ldbl_proto. Since the macro is needed for some of
> these *_chk functions for _FORTIFY_SOURCE to be enabled, that needed to
> be fixed.
> While at it, all the *_chk function get renamed appropriately for
> consistency, even if not strictly necessary.
> ---
LGTM, but I'd like Raji to pitch in as well as ppc maintainer.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-swprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c | 8 ++++----
> .../ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c | 4 ++--
> .../ieee754/ldbl-128ibm-compat/ieee128-vfwprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c | 4 ++--
> .../ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c | 4 ++--
> .../ieee754/ldbl-128ibm-compat/ieee128-vswprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c | 4 ++--
> sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c | 4 ++--
> 19 files changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c
> index a50e334a2c..fbf953a728 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-asprintf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_asprintf_chk (char **string_ptr, int flag, const char *format, ...)
> +___ieee128___asprintf_chk (char **string_ptr, int flag, const char *format, ...)
> {
> va_list ap;
> int done;
> @@ -35,4 +35,4 @@ ___ieee128_asprintf_chk (char **string_ptr, int flag, const char *format, ...)
>
> return done;
> }
> -strong_alias (___ieee128_asprintf_chk, __asprintf_chkieee128)
> +strong_alias (___ieee128___asprintf_chk, __asprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c
> index b53b06a513..7121020ed5 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-dprintf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_dprintf_chk (int d, int flag, const char *format, ...)
> +___ieee128___dprintf_chk (int d, int flag, const char *format, ...)
> {
> va_list ap;
> int done;
> @@ -35,4 +35,4 @@ ___ieee128_dprintf_chk (int d, int flag, const char *format, ...)
>
> return done;
> }
> -strong_alias (___ieee128_dprintf_chk, __dprintf_chkieee128)
> +strong_alias (___ieee128___dprintf_chk, __dprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c
> index 44eed0de99..bd10e9c3db 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fprintf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_fprintf_chk (FILE *fp, int flag, const char *format, ...)
> +___ieee128___fprintf_chk (FILE *fp, int flag, const char *format, ...)
> {
> va_list ap;
> int done;
> @@ -35,4 +35,4 @@ ___ieee128_fprintf_chk (FILE *fp, int flag, const char *format, ...)
>
> return done;
> }
> -strong_alias (___ieee128_fprintf_chk, __fprintf_chkieee128)
> +strong_alias (___ieee128___fprintf_chk, __fprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c
> index 83c2f8e8d7..5b6cc3e768 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-fwprintf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_fwprintf_chk (FILE *fp, int flag, const wchar_t *format, ...)
> +___ieee128___fwprintf_chk (FILE *fp, int flag, const wchar_t *format, ...)
> {
> va_list ap;
> int done;
> @@ -35,4 +35,4 @@ ___ieee128_fwprintf_chk (FILE *fp, int flag, const wchar_t *format, ...)
>
> return done;
> }
> -strong_alias (___ieee128_fwprintf_chk, __fwprintf_chkieee128)
> +strong_alias (___ieee128___fwprintf_chk, __fwprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c
> index ab5fe59c37..333f4e14b1 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-printf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_printf_chk (int flag, const char *format, ...)
> +___ieee128___printf_chk (int flag, const char *format, ...)
> {
> va_list ap;
> int done;
> @@ -35,4 +35,4 @@ ___ieee128_printf_chk (int flag, const char *format, ...)
>
> return done;
> }
> -strong_alias (___ieee128_printf_chk, __printf_chkieee128)
> +strong_alias (___ieee128___printf_chk, __printf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c
> index 0ff2486642..a65f193dc1 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-snprintf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_snprintf_chk (char *s, size_t maxlen, int flag, size_t slen,
> +___ieee128___snprintf_chk (char *s, size_t maxlen, int flag, size_t slen,
> const char *format, ...)
> {
> va_list ap;
> @@ -39,4 +39,4 @@ ___ieee128_snprintf_chk (char *s, size_t maxlen, int flag, size_t slen,
>
> return done;
> }
> -strong_alias (___ieee128_snprintf_chk, __snprintf_chkieee128)
> +strong_alias (___ieee128___snprintf_chk, __snprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c
> index a0e598db42..0039c3b53d 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-sprintf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_sprintf_chk (char *s, int flag, size_t slen,
> +___ieee128___sprintf_chk (char *s, int flag, size_t slen,
> const char *format, ...)
> {
> va_list ap;
> @@ -43,4 +43,4 @@ ___ieee128_sprintf_chk (char *s, int flag, size_t slen,
>
> return done;
> }
> -strong_alias (___ieee128_sprintf_chk, __sprintf_chkieee128)
> +strong_alias (___ieee128___sprintf_chk, __sprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-swprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-swprintf_chk.c
> index 2453c231b8..b81e9ccc05 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-swprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-swprintf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_swprintf_chk (wchar_t *string, size_t maxlen, int flag,
> +___ieee128___swprintf_chk (wchar_t *string, size_t maxlen, int flag,
> size_t slen, const wchar_t *format, ...)
> {
> va_list ap;
> @@ -39,4 +39,4 @@ ___ieee128_swprintf_chk (wchar_t *string, size_t maxlen, int flag,
>
> return done;
> }
> -strong_alias (___ieee128_swprintf_chk, __swprintf_chkieee128)
> +strong_alias (___ieee128___swprintf_chk, __swprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c
> index 4ed4621b96..18aa7f707f 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-syslog.c
> @@ -40,7 +40,7 @@ ___ieee128_vsyslog (int pri, const char *fmt, va_list ap)
> strong_alias (___ieee128_vsyslog, __vsyslogieee128)
>
> void
> -___ieee128_syslog_chk (int pri, int flag, const char *fmt, ...)
> +___ieee128___syslog_chk (int pri, int flag, const char *fmt, ...)
> {
> va_list ap;
>
> @@ -52,10 +52,10 @@ ___ieee128_syslog_chk (int pri, int flag, const char *fmt, ...)
> __vsyslog_internal (pri, fmt, ap, mode);
> va_end (ap);
> }
> -strong_alias (___ieee128_syslog_chk, __syslog_chkieee128)
> +strong_alias (___ieee128___syslog_chk, __syslog_chkieee128)
>
> void
> -___ieee128_vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
> +___ieee128___vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> if (flag > 0)
> @@ -63,4 +63,4 @@ ___ieee128_vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
>
> __vsyslog_internal (pri, fmt, ap, mode);
> }
> -strong_alias (___ieee128_vsyslog_chk, __vsyslog_chkieee128)
> +strong_alias (___ieee128___vsyslog_chk, __vsyslog_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c
> index 5350e777f3..a5a048f2b5 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vasprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vasprintf_chk (char **result_ptr, int flag, const char *format,
> +___ieee128___vasprintf_chk (char **result_ptr, int flag, const char *format,
> va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> @@ -28,4 +28,4 @@ ___ieee128_vasprintf_chk (char **result_ptr, int flag, const char *format,
>
> return __vasprintf_internal (result_ptr, format, ap, mode);
> }
> -strong_alias (___ieee128_vasprintf_chk, __vasprintf_chkieee128)
> +strong_alias (___ieee128___vasprintf_chk, __vasprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c
> index 7e38917cb5..ac7f26ec6d 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vdprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vdprintf_chk (int d, int flag, const char *format, va_list ap)
> +___ieee128___vdprintf_chk (int d, int flag, const char *format, va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> if (flag > 0)
> @@ -27,4 +27,4 @@ ___ieee128_vdprintf_chk (int d, int flag, const char *format, va_list ap)
>
> return __vdprintf_internal (d, format, ap, mode);
> }
> -strong_alias (___ieee128_vdprintf_chk, __vdprintf_chkieee128)
> +strong_alias (___ieee128___vdprintf_chk, __vdprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c
> index bf2ace508f..50c12265bc 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vfprintf_chk (FILE *fp, int flag, const char *format, va_list ap)
> +___ieee128___vfprintf_chk (FILE *fp, int flag, const char *format, va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> if (flag > 0)
> @@ -27,4 +27,4 @@ ___ieee128_vfprintf_chk (FILE *fp, int flag, const char *format, va_list ap)
>
> return __vfprintf_internal (fp, format, ap, mode);
> }
> -strong_alias (___ieee128_vfprintf_chk, __vfprintf_chkieee128)
> +strong_alias (___ieee128___vfprintf_chk, __vfprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfwprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfwprintf_chk.c
> index b2379176f2..a5005927dc 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfwprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vfwprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vfwprintf_chk (FILE *fp, int flag, const wchar_t *format,
> +___ieee128___vfwprintf_chk (FILE *fp, int flag, const wchar_t *format,
> va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> @@ -28,4 +28,4 @@ ___ieee128_vfwprintf_chk (FILE *fp, int flag, const wchar_t *format,
>
> return __vfwprintf_internal (fp, format, ap, mode);
> }
> -strong_alias (___ieee128_vfwprintf_chk, __vfwprintf_chkieee128)
> +strong_alias (___ieee128___vfwprintf_chk, __vfwprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c
> index ca718d06bb..1281e41b6f 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vprintf_chk (int flag, const char *format, va_list ap)
> +___ieee128___vprintf_chk (int flag, const char *format, va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> if (flag > 0)
> @@ -27,4 +27,4 @@ ___ieee128_vprintf_chk (int flag, const char *format, va_list ap)
>
> return __vfprintf_internal (stdout, format, ap, mode);
> }
> -strong_alias (___ieee128_vprintf_chk, __vprintf_chkieee128)
> +strong_alias (___ieee128___vprintf_chk, __vprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c
> index 79d359b5d4..d91e8fa956 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsnprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vsnprintf_chk (char *string, size_t maxlen, int flag,
> +___ieee128___vsnprintf_chk (char *string, size_t maxlen, int flag,
> size_t slen, const char *format, va_list ap)
> {
> if (__glibc_unlikely (slen < maxlen))
> @@ -31,4 +31,4 @@ ___ieee128_vsnprintf_chk (char *string, size_t maxlen, int flag,
>
> return __vsnprintf_internal (string, maxlen, format, ap, mode);
> }
> -strong_alias (___ieee128_vsnprintf_chk, __vsnprintf_chkieee128)
> +strong_alias (___ieee128___vsnprintf_chk, __vsnprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c
> index b4b2b2d14f..22137269c0 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vsprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vsprintf_chk (char *string, int flag, size_t slen,
> +___ieee128___vsprintf_chk (char *string, int flag, size_t slen,
> const char *format, va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> @@ -35,4 +35,4 @@ ___ieee128_vsprintf_chk (char *string, int flag, size_t slen,
>
> return __vsprintf_internal (string, slen, format, ap, mode);
> }
> -strong_alias (___ieee128_vsprintf_chk, __vsprintf_chkieee128)
> +strong_alias (___ieee128___vsprintf_chk, __vsprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vswprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vswprintf_chk.c
> index 9cd56ba5d4..888513d3c6 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vswprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vswprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vswprintf_chk (wchar_t *string, size_t maxlen, int flag,
> +___ieee128___vswprintf_chk (wchar_t *string, size_t maxlen, int flag,
> size_t slen, const wchar_t *format, va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> @@ -31,4 +31,4 @@ ___ieee128_vswprintf_chk (wchar_t *string, size_t maxlen, int flag,
>
> return __vswprintf_internal (string, maxlen, format, ap, mode);
> }
> -strong_alias (___ieee128_vswprintf_chk, __vswprintf_chkieee128)
> +strong_alias (___ieee128___vswprintf_chk, __vswprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c
> index 3861edf480..f61f2d6c44 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-vwprintf_chk.c
> @@ -19,7 +19,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_vwprintf_chk (int flag, const wchar_t *format, va_list ap)
> +___ieee128___vwprintf_chk (int flag, const wchar_t *format, va_list ap)
> {
> unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
> if (flag > 0)
> @@ -27,4 +27,4 @@ ___ieee128_vwprintf_chk (int flag, const wchar_t *format, va_list ap)
>
> return __vfwprintf_internal (stdout, format, ap, mode);
> }
> -strong_alias (___ieee128_vwprintf_chk, __vwprintf_chkieee128)
> +strong_alias (___ieee128___vwprintf_chk, __vwprintf_chkieee128)
> diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c
> index 440e0691cb..19d9a92dd2 100644
> --- a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c
> +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-wprintf_chk.c
> @@ -20,7 +20,7 @@
> #include <libio/libioP.h>
>
> extern int
> -___ieee128_wprintf_chk (int flag, const wchar_t *format, ...)
> +___ieee128___wprintf_chk (int flag, const wchar_t *format, ...)
> {
> va_list ap;
> int done;
> @@ -35,4 +35,4 @@ ___ieee128_wprintf_chk (int flag, const wchar_t *format, ...)
>
> return done;
> }
> -strong_alias (___ieee128_wprintf_chk, __wprintf_chkieee128)
> +strong_alias (___ieee128___wprintf_chk, __wprintf_chkieee128)
On 6/30/23 9:58 AM, Siddhesh Poyarekar wrote:
>
>
> On 2023-06-28 04:42, Frédéric Bérat wrote:
>> The *_chk routines naming doesn't match the name that would be generated
>> using libc_hidden_ldbl_proto. Since the macro is needed for some of
>> these *_chk functions for _FORTIFY_SOURCE to be enabled, that needed to
>> be fixed.
>> While at it, all the *_chk function get renamed appropriately for
>> consistency, even if not strictly necessary.
>> ---
>
> LGTM, but I'd like Raji to pitch in as well as ppc maintainer.
This LGTM (on behalf of Raji). I am surprised this wasn't noticed
sooner. Was it not noticed because there are no internal calls within
libc to these functions?
Reviewed-by: Paul E. Murphy <murphyp@linux.ibm.com>
On Fri, Jun 30, 2023 at 5:55 PM Paul E Murphy <murphyp@linux.ibm.com> wrote:
>
>
> On 6/30/23 9:58 AM, Siddhesh Poyarekar wrote:
> >
> >
> > On 2023-06-28 04:42, Frédéric Bérat wrote:
> >> The *_chk routines naming doesn't match the name that would be generated
> >> using libc_hidden_ldbl_proto. Since the macro is needed for some of
> >> these *_chk functions for _FORTIFY_SOURCE to be enabled, that needed to
> >> be fixed.
> >> While at it, all the *_chk function get renamed appropriately for
> >> consistency, even if not strictly necessary.
> >> ---
> >
> > LGTM, but I'd like Raji to pitch in as well as ppc maintainer.
>
>
> This LGTM (on behalf of Raji). I am surprised this wasn't noticed
> sooner. Was it not noticed because there are no internal calls within
> libc to these functions?
>
>
It wasn't noticed because the macros were not used nor needed as long as
building glibc with fortification was forbidden by the configure script.
> Reviewed-by: Paul E. Murphy <murphyp@linux.ibm.com>
>
>
>
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_asprintf_chk (char **string_ptr, int flag, const char *format, ...)
+___ieee128___asprintf_chk (char **string_ptr, int flag, const char *format, ...)
{
va_list ap;
int done;
@@ -35,4 +35,4 @@ ___ieee128_asprintf_chk (char **string_ptr, int flag, const char *format, ...)
return done;
}
-strong_alias (___ieee128_asprintf_chk, __asprintf_chkieee128)
+strong_alias (___ieee128___asprintf_chk, __asprintf_chkieee128)
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_dprintf_chk (int d, int flag, const char *format, ...)
+___ieee128___dprintf_chk (int d, int flag, const char *format, ...)
{
va_list ap;
int done;
@@ -35,4 +35,4 @@ ___ieee128_dprintf_chk (int d, int flag, const char *format, ...)
return done;
}
-strong_alias (___ieee128_dprintf_chk, __dprintf_chkieee128)
+strong_alias (___ieee128___dprintf_chk, __dprintf_chkieee128)
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_fprintf_chk (FILE *fp, int flag, const char *format, ...)
+___ieee128___fprintf_chk (FILE *fp, int flag, const char *format, ...)
{
va_list ap;
int done;
@@ -35,4 +35,4 @@ ___ieee128_fprintf_chk (FILE *fp, int flag, const char *format, ...)
return done;
}
-strong_alias (___ieee128_fprintf_chk, __fprintf_chkieee128)
+strong_alias (___ieee128___fprintf_chk, __fprintf_chkieee128)
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_fwprintf_chk (FILE *fp, int flag, const wchar_t *format, ...)
+___ieee128___fwprintf_chk (FILE *fp, int flag, const wchar_t *format, ...)
{
va_list ap;
int done;
@@ -35,4 +35,4 @@ ___ieee128_fwprintf_chk (FILE *fp, int flag, const wchar_t *format, ...)
return done;
}
-strong_alias (___ieee128_fwprintf_chk, __fwprintf_chkieee128)
+strong_alias (___ieee128___fwprintf_chk, __fwprintf_chkieee128)
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_printf_chk (int flag, const char *format, ...)
+___ieee128___printf_chk (int flag, const char *format, ...)
{
va_list ap;
int done;
@@ -35,4 +35,4 @@ ___ieee128_printf_chk (int flag, const char *format, ...)
return done;
}
-strong_alias (___ieee128_printf_chk, __printf_chkieee128)
+strong_alias (___ieee128___printf_chk, __printf_chkieee128)
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_snprintf_chk (char *s, size_t maxlen, int flag, size_t slen,
+___ieee128___snprintf_chk (char *s, size_t maxlen, int flag, size_t slen,
const char *format, ...)
{
va_list ap;
@@ -39,4 +39,4 @@ ___ieee128_snprintf_chk (char *s, size_t maxlen, int flag, size_t slen,
return done;
}
-strong_alias (___ieee128_snprintf_chk, __snprintf_chkieee128)
+strong_alias (___ieee128___snprintf_chk, __snprintf_chkieee128)
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_sprintf_chk (char *s, int flag, size_t slen,
+___ieee128___sprintf_chk (char *s, int flag, size_t slen,
const char *format, ...)
{
va_list ap;
@@ -43,4 +43,4 @@ ___ieee128_sprintf_chk (char *s, int flag, size_t slen,
return done;
}
-strong_alias (___ieee128_sprintf_chk, __sprintf_chkieee128)
+strong_alias (___ieee128___sprintf_chk, __sprintf_chkieee128)
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_swprintf_chk (wchar_t *string, size_t maxlen, int flag,
+___ieee128___swprintf_chk (wchar_t *string, size_t maxlen, int flag,
size_t slen, const wchar_t *format, ...)
{
va_list ap;
@@ -39,4 +39,4 @@ ___ieee128_swprintf_chk (wchar_t *string, size_t maxlen, int flag,
return done;
}
-strong_alias (___ieee128_swprintf_chk, __swprintf_chkieee128)
+strong_alias (___ieee128___swprintf_chk, __swprintf_chkieee128)
@@ -40,7 +40,7 @@ ___ieee128_vsyslog (int pri, const char *fmt, va_list ap)
strong_alias (___ieee128_vsyslog, __vsyslogieee128)
void
-___ieee128_syslog_chk (int pri, int flag, const char *fmt, ...)
+___ieee128___syslog_chk (int pri, int flag, const char *fmt, ...)
{
va_list ap;
@@ -52,10 +52,10 @@ ___ieee128_syslog_chk (int pri, int flag, const char *fmt, ...)
__vsyslog_internal (pri, fmt, ap, mode);
va_end (ap);
}
-strong_alias (___ieee128_syslog_chk, __syslog_chkieee128)
+strong_alias (___ieee128___syslog_chk, __syslog_chkieee128)
void
-___ieee128_vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
+___ieee128___vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
if (flag > 0)
@@ -63,4 +63,4 @@ ___ieee128_vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
__vsyslog_internal (pri, fmt, ap, mode);
}
-strong_alias (___ieee128_vsyslog_chk, __vsyslog_chkieee128)
+strong_alias (___ieee128___vsyslog_chk, __vsyslog_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vasprintf_chk (char **result_ptr, int flag, const char *format,
+___ieee128___vasprintf_chk (char **result_ptr, int flag, const char *format,
va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
@@ -28,4 +28,4 @@ ___ieee128_vasprintf_chk (char **result_ptr, int flag, const char *format,
return __vasprintf_internal (result_ptr, format, ap, mode);
}
-strong_alias (___ieee128_vasprintf_chk, __vasprintf_chkieee128)
+strong_alias (___ieee128___vasprintf_chk, __vasprintf_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vdprintf_chk (int d, int flag, const char *format, va_list ap)
+___ieee128___vdprintf_chk (int d, int flag, const char *format, va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
if (flag > 0)
@@ -27,4 +27,4 @@ ___ieee128_vdprintf_chk (int d, int flag, const char *format, va_list ap)
return __vdprintf_internal (d, format, ap, mode);
}
-strong_alias (___ieee128_vdprintf_chk, __vdprintf_chkieee128)
+strong_alias (___ieee128___vdprintf_chk, __vdprintf_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vfprintf_chk (FILE *fp, int flag, const char *format, va_list ap)
+___ieee128___vfprintf_chk (FILE *fp, int flag, const char *format, va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
if (flag > 0)
@@ -27,4 +27,4 @@ ___ieee128_vfprintf_chk (FILE *fp, int flag, const char *format, va_list ap)
return __vfprintf_internal (fp, format, ap, mode);
}
-strong_alias (___ieee128_vfprintf_chk, __vfprintf_chkieee128)
+strong_alias (___ieee128___vfprintf_chk, __vfprintf_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vfwprintf_chk (FILE *fp, int flag, const wchar_t *format,
+___ieee128___vfwprintf_chk (FILE *fp, int flag, const wchar_t *format,
va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
@@ -28,4 +28,4 @@ ___ieee128_vfwprintf_chk (FILE *fp, int flag, const wchar_t *format,
return __vfwprintf_internal (fp, format, ap, mode);
}
-strong_alias (___ieee128_vfwprintf_chk, __vfwprintf_chkieee128)
+strong_alias (___ieee128___vfwprintf_chk, __vfwprintf_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vprintf_chk (int flag, const char *format, va_list ap)
+___ieee128___vprintf_chk (int flag, const char *format, va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
if (flag > 0)
@@ -27,4 +27,4 @@ ___ieee128_vprintf_chk (int flag, const char *format, va_list ap)
return __vfprintf_internal (stdout, format, ap, mode);
}
-strong_alias (___ieee128_vprintf_chk, __vprintf_chkieee128)
+strong_alias (___ieee128___vprintf_chk, __vprintf_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vsnprintf_chk (char *string, size_t maxlen, int flag,
+___ieee128___vsnprintf_chk (char *string, size_t maxlen, int flag,
size_t slen, const char *format, va_list ap)
{
if (__glibc_unlikely (slen < maxlen))
@@ -31,4 +31,4 @@ ___ieee128_vsnprintf_chk (char *string, size_t maxlen, int flag,
return __vsnprintf_internal (string, maxlen, format, ap, mode);
}
-strong_alias (___ieee128_vsnprintf_chk, __vsnprintf_chkieee128)
+strong_alias (___ieee128___vsnprintf_chk, __vsnprintf_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vsprintf_chk (char *string, int flag, size_t slen,
+___ieee128___vsprintf_chk (char *string, int flag, size_t slen,
const char *format, va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
@@ -35,4 +35,4 @@ ___ieee128_vsprintf_chk (char *string, int flag, size_t slen,
return __vsprintf_internal (string, slen, format, ap, mode);
}
-strong_alias (___ieee128_vsprintf_chk, __vsprintf_chkieee128)
+strong_alias (___ieee128___vsprintf_chk, __vsprintf_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vswprintf_chk (wchar_t *string, size_t maxlen, int flag,
+___ieee128___vswprintf_chk (wchar_t *string, size_t maxlen, int flag,
size_t slen, const wchar_t *format, va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
@@ -31,4 +31,4 @@ ___ieee128_vswprintf_chk (wchar_t *string, size_t maxlen, int flag,
return __vswprintf_internal (string, maxlen, format, ap, mode);
}
-strong_alias (___ieee128_vswprintf_chk, __vswprintf_chkieee128)
+strong_alias (___ieee128___vswprintf_chk, __vswprintf_chkieee128)
@@ -19,7 +19,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_vwprintf_chk (int flag, const wchar_t *format, va_list ap)
+___ieee128___vwprintf_chk (int flag, const wchar_t *format, va_list ap)
{
unsigned int mode = PRINTF_LDBL_USES_FLOAT128;
if (flag > 0)
@@ -27,4 +27,4 @@ ___ieee128_vwprintf_chk (int flag, const wchar_t *format, va_list ap)
return __vfwprintf_internal (stdout, format, ap, mode);
}
-strong_alias (___ieee128_vwprintf_chk, __vwprintf_chkieee128)
+strong_alias (___ieee128___vwprintf_chk, __vwprintf_chkieee128)
@@ -20,7 +20,7 @@
#include <libio/libioP.h>
extern int
-___ieee128_wprintf_chk (int flag, const wchar_t *format, ...)
+___ieee128___wprintf_chk (int flag, const wchar_t *format, ...)
{
va_list ap;
int done;
@@ -35,4 +35,4 @@ ___ieee128_wprintf_chk (int flag, const wchar_t *format, ...)
return done;
}
-strong_alias (___ieee128_wprintf_chk, __wprintf_chkieee128)
+strong_alias (___ieee128___wprintf_chk, __wprintf_chkieee128)