From 58548b9d689fb9bba67bdc5b59c8d2fa47f4f8ec Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 18 Oct 2022 17:00:07 +0200 Subject: 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 --- nss/nss_module.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'nss') diff --git a/nss/nss_module.c b/nss/nss_module.c index 9a8f3ddf94..444facb9b8 100644 --- a/nss/nss_module.c +++ b/nss/nss_module.c @@ -128,10 +128,8 @@ module_load_builtin (struct nss_module *module, case nss_module_failed: bind (module->functions.untyped); -#ifdef PTR_MANGLE for (int i = 0; i < nss_module_functions_count; ++i) PTR_MANGLE (module->functions.untyped[i]); -#endif module->handle = NULL; /* Synchronizes with unlocked __nss_module_load atomic_load_acquire. */ @@ -153,9 +151,7 @@ module_load_nss_files (struct nss_module *module) if (is_nscd) { void (*cb) (size_t, struct traced_file *) = nscd_init_cb; -# ifdef PTR_DEMANGLE PTR_DEMANGLE (cb); -# endif _nss_files_init (cb); } #endif @@ -239,9 +235,7 @@ module_load (struct nss_module *module) } pointers[idx] = __libc_dlsym (handle, function_name); free (function_name); -#ifdef PTR_MANGLE PTR_MANGLE (pointers[idx]); -#endif } # ifdef USE_NSCD @@ -264,9 +258,7 @@ module_load (struct nss_module *module) if (ifct != NULL) { void (*cb) (size_t, struct traced_file *) = nscd_init_cb; -# ifdef PTR_DEMANGLE PTR_DEMANGLE (cb); -# endif ifct (cb); } } @@ -349,9 +341,7 @@ __nss_module_get_function (struct nss_module *module, const char *name) assert (name_entry != NULL); size_t idx = name_entry - nss_function_name_array; void *fptr = module->functions.untyped[idx]; -#ifdef PTR_DEMANGLE PTR_DEMANGLE (fptr); -#endif return fptr; } @@ -382,9 +372,7 @@ __nss_disable_nscd (void (*cb) (size_t, struct traced_file *)) { void (*cb1) (size_t, struct traced_file *); cb1 = cb; -# ifdef PTR_MANGLE PTR_MANGLE (cb); -# endif nscd_init_cb = cb; is_nscd = true; -- cgit 1.4.1