diff options
author | Florian Weimer <fweimer@redhat.com> | 2022-10-18 17:00:07 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2022-10-18 17:04:10 +0200 |
commit | 58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec (patch) | |
tree | 0aea307f4cf761952fbdf15fd67fc3b09b43707c /inet | |
parent | Introduce <pointer_guard.h>, extracted from <sysdep.h> (diff) | |
download | glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.tar.gz glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.tar.bz2 glibc-58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec.zip |
Use PTR_MANGLE and PTR_DEMANGLE unconditionally in C sources
In the future, this will result in a compilation failure if the
macros are unexpectedly undefined (due to header inclusion ordering
or header inclusion missing altogether).
Assembler sources are more difficult to convert. In many cases,
they are hand-optimized for the mangling and no-mangling variants,
which is why they are not converted.
sysdeps/s390/s390-32/__longjmp.c and sysdeps/s390/s390-64/__longjmp.c
are special: These are C sources, but most of the implementation is
in assembler, so the PTR_DEMANGLE macro has to be undefined in some
cases, to match the assembler style.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'inet')
-rw-r--r-- | inet/idna.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/inet/idna.c b/inet/idna.c index df5811fd6a..2243d3e7d9 100644 --- a/inet/idna.c +++ b/inet/idna.c @@ -73,10 +73,8 @@ functions_allocate (void *closure) result->handle = handle; result->lookup_ul = ptr_lookup_ul; result->to_unicode_lzlz = ptr_to_unicode_lzlz; -#ifdef PTR_MANGLE PTR_MANGLE (result->lookup_ul); PTR_MANGLE (result->to_unicode_lzlz); -#endif return result; } @@ -138,9 +136,7 @@ __idna_to_dns_encoding (const char *name, char **result) return EAI_IDN_ENCODE; char *ptr = NULL; __typeof__ (functions->lookup_ul) fptr = functions->lookup_ul; -#ifdef PTR_DEMANGLE PTR_DEMANGLE (fptr); -#endif int ret = fptr (name, &ptr, 0); if (ret == 0) { @@ -165,9 +161,7 @@ __idna_from_dns_encoding (const char *name, char **result) return gai_strdup (name, result); char *ptr = NULL; __typeof__ (functions->to_unicode_lzlz) fptr = functions->to_unicode_lzlz; -#ifdef PTR_DEMANGLE PTR_DEMANGLE (fptr); -#endif int ret = fptr (name, &ptr, 0); if (ret == 0) { |