@@ -244,7 +244,6 @@ extern const size_t _sys_errlist_internal_len attribute_hidden;
extern const char *__get_errlist (int) attribute_hidden;
extern const char *__get_errname (int) attribute_hidden;
-libc_hidden_ldbl_proto (__aprintf)
libc_hidden_ldbl_proto (__asprintf)
# if IS_IN (libc)
@@ -206,12 +206,6 @@ __NTH (aprintf (const char *__restrict __fmt, ...))
return __aprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
}
-__fortify_function char *
-__NTH (__aprintf (const char *__restrict __fmt, ...))
-{
- return __aprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
-}
-
__fortify_function int
__NTH (asprintf (char **__restrict __ptr, const char *__restrict __fmt, ...))
{
@@ -245,16 +239,6 @@ __NTH (aprintf (const char *__restrict __fmt, ...))
return __p;
}
-__fortify_function char *
-__NTH (__aprintf (const char *__restrict __fmt, ...))
-{
- __gnuc_va_list __fortify_ap;
- __builtin_va_start (__fortify_ap, __fmt);
- char *__p = __vaprintf_chk (__USE_FORTIFY_LEVEL - 1, __fmt, __fortify_ap);
- __builtin_va_end (__fortify_ap);
- return __p;
-}
-
__fortify_function_error_function __attribute_overloadable__ int
__NTH (asprintf (__fortify_clang_overload_arg (char **, __restrict, __ptr),
const char *__restrict __fmt, ...))
@@ -294,8 +278,6 @@ __NTH (obstack_printf (__fortify_clang_overload_arg (struct obstack *,
# elif !defined __cplusplus
# define aprintf(...) \
__aprintf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-# define __aprintf(...) \
- __aprintf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
# define asprintf(ptr, ...) \
__asprintf_chk (ptr, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
# define __asprintf(ptr, ...) \
@@ -417,9 +417,6 @@ extern int asprintf (char **__restrict __ptr,
extern char *vaprintf (const char *__restrict __fmt, __gnuc_va_list __ap)
__THROWNL __attribute__ ((__format__ (__printf__, 1, 0)))
__attribute_malloc__ __attr_dealloc_free;
-extern char *__aprintf (const char *__restrict __fmt, ...)
- __THROWNL __attribute__ ((__format__ (__printf__, 1, 2)))
- __attribute_malloc__ __attr_dealloc_free;
extern char *aprintf (const char *__restrict __fmt, ...)
__THROWNL __attribute__ ((__format__ (__printf__, 1, 2)))
__attribute_malloc__ __attr_dealloc_free;
@@ -30,10 +30,9 @@
#include <stdio.h>
char *
-__vaprintf (const char *fmt, va_list ap)
+vaprintf (const char *fmt, va_list ap)
{
char *p;
return __vasprintf_internal (&p, fmt, ap, 0) < 0 ? NULL : p;
}
-ldbl_weak_alias (__vaprintf, vaprintf)
@@ -34,7 +34,4 @@ ___aprintf (const char *fmt, ...)
return p;
}
-ldbl_hidden_def (___aprintf, __aprintf)
-
-ldbl_strong_alias (___aprintf, __aprintf)
ldbl_weak_alias (___aprintf, aprintf)
@@ -99,10 +99,8 @@ libc {
__nldbl___isoc23_vswscanf;
}
GLIBC_2.44 {
- __aprintf;
aprintf;
vaprintf;
- __nldbl___aprintf;
__nldbl_aprintf;
__nldbl_vaprintf;
__nldbl___aprintf_chk;
@@ -1,8 +1,7 @@
#include "nldbl-compat.h"
-attribute_hidden
char *
-__aprintf (const char *fmt, ...)
+aprintf (const char *fmt, ...)
{
va_list ap;
char *p;
@@ -13,5 +12,3 @@ __aprintf (const char *fmt, ...)
return p;
}
-extern __typeof (__aprintf) aprintf attribute_hidden;
-weak_alias (__aprintf, aprintf)
@@ -55,22 +55,6 @@ libc_hidden_proto (__nldbl___isoc23_vfwscanf)
we don't need to split this into one file per function for the
sake of statically linked programs. */
-char *
-attribute_compat_text_section
-__nldbl___aprintf (const char *fmt, ...)
-{
- va_list ap;
- char *p;
-
- va_start (ap, fmt);
- if (__vasprintf_internal (&p, fmt, ap, PRINTF_LDBL_IS_DBL) < 0)
- p = NULL;
- va_end (ap);
-
- return p;
-}
-weak_alias (__nldbl___aprintf, __nldbl_aprintf)
-
int
attribute_compat_text_section
__nldbl___asprintf (char **string_ptr, const char *fmt, ...)
@@ -224,14 +208,6 @@ __nldbl_swprintf (wchar_t *s, size_t n, const wchar_t *fmt, ...)
return ret;
}
-char *
-attribute_compat_text_section weak_function
-__nldbl_vaprintf (const char *fmt, va_list ap)
-{
- char *p;
- return __vasprintf_internal (&p, fmt, ap, PRINTF_LDBL_IS_DBL) < 0 ? NULL : p;
-}
-
int
attribute_compat_text_section weak_function
__nldbl_vasprintf (char **result_ptr, const char *fmt, va_list ap)
@@ -675,36 +651,6 @@ __nldbl___wprintf_chk (int flag, const wchar_t *fmt, ...)
return ret;
}
-char *
-attribute_compat_text_section
-__nldbl___vaprintf_chk (int flag, const char *fmt, va_list ap)
-{
- char *p;
- unsigned int mode = PRINTF_LDBL_IS_DBL;
- if (flag > 0)
- mode |= PRINTF_FORTIFY;
-
- return __vasprintf_internal (&p, fmt, ap, mode) < 0 ? NULL : p;
-}
-
-char *
-attribute_compat_text_section
-__nldbl___aprintf_chk (int flag, const char *fmt, ...)
-{
- va_list ap;
- char *p;
- unsigned int mode = PRINTF_LDBL_IS_DBL;
- if (flag > 0)
- mode |= PRINTF_FORTIFY;
-
- va_start (ap, fmt);
- if (__vasprintf_internal (&p, fmt, ap, mode) < 0)
- p = NULL;
- va_end (ap);
-
- return p;
-}
-
int
attribute_compat_text_section
__nldbl___vasprintf_chk (char **ptr, int flag, const char *fmt, va_list ap)
@@ -1396,8 +1342,3 @@ compat_symbol (libc, __nldbl___fprintf_chk, __fprintf_chk, GLIBC_2_3_4);
compat_symbol (libc, __nldbl___vprintf_chk, __vprintf_chk, GLIBC_2_3_4);
compat_symbol (libc, __nldbl___vfprintf_chk, __vfprintf_chk, GLIBC_2_3_4);
#endif
-#if LONG_DOUBLE_COMPAT(libc, GLIBC_2_44)
-compat_symbol (libc, __nldbl_aprintf, aprintf, GLIBC_2_44);
-compat_symbol (libc, __nldbl_vaprintf, vaprintf, GLIBC_2_44);
-compat_symbol (libc, __nldbl___aprintf, __aprintf, GLIBC_2_44);
-#endif
@@ -2798,7 +2798,6 @@ GLIBC_2.43 tss_delete F
GLIBC_2.43 tss_get F
GLIBC_2.43 tss_set F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __mq_open_2 F
GLIBC_2.44 __vaprintf_chk F
@@ -2474,7 +2474,6 @@ GLIBC_2.43 tss_delete F
GLIBC_2.43 tss_get F
GLIBC_2.43 tss_set F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __mq_open_2 F
GLIBC_2.44 __vaprintf_chk F
@@ -2775,7 +2775,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -3122,7 +3122,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2536,7 +2536,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2828,7 +2828,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2825,7 +2825,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2812,7 +2812,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2849,7 +2849,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -3032,7 +3032,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2296,7 +2296,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2808,7 +2808,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2975,7 +2975,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2861,7 +2861,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2858,7 +2858,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2938,7 +2938,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2936,7 +2936,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2944,7 +2944,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2846,7 +2846,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2286,7 +2286,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -3165,7 +3165,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -3210,7 +3210,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2919,7 +2919,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2995,7 +2995,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2539,7 +2539,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2739,7 +2739,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2956,7 +2956,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2855,7 +2855,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2852,7 +2852,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -3186,7 +3186,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2822,7 +2822,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2771,7 +2771,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F
@@ -2790,7 +2790,6 @@ GLIBC_2.43 memset_explicit F
GLIBC_2.43 mseal F
GLIBC_2.43 openat2 F
GLIBC_2.43 umaxabs F
-GLIBC_2.44 __aprintf F
GLIBC_2.44 __aprintf_chk F
GLIBC_2.44 __vaprintf_chk F
GLIBC_2.44 aprintf F