morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

shared/dlfcn-util: add sentinel helper or for dlsym_many_or_warn()

Browse Source 
I didn't do this before to avoid churn in all the users.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-06-22 09:26:09 +02:00
parent d32f7a8e9b
commit cd503dbb6b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/dlfcn-util.c
View File

@@ -26,7 +26,7 @@ static int dlsym_many_or_warnv(void *dl, int log_level, va_list ap) {
return 0;
}
int dlsym_many_or_warn(void *dl, int log_level, ...) {
int dlsym_many_or_warn_sentinel(void *dl, int log_level, ...) {
va_list ap;
int r;

4
src/shared/dlfcn-util.h
View File

@@ -7,9 +7,11 @@
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(void*, dlclose, NULL);
int dlsym_many_or_warn(void *dl, int log_level, ...) _sentinel_;
int dlsym_many_or_warn_sentinel(void *dl, int log_level, ...) _sentinel_;
int dlopen_many_sym_or_warn_sentinel(void **dlp, const char *filename, int log_level, ...) _sentinel_;
#define dlsym_many_or_warn(dl, log_level, ...) \
dlsym_many_or_warn_sentinel(dl, log_level, __VA_ARGS__, NULL)
#define dlopen_many_sym_or_warn(dlp, filename, log_level, ...) \
dlopen_many_sym_or_warn_sentinel(dlp, filename, log_level, __VA_ARGS__, NULL)

3
src/shared/idn-util.c
View File

@@ -58,8 +58,7 @@ int dlopen_idn(void) {
DLSYM_ARG(idna_to_ascii_4i),
DLSYM_ARG(idna_to_unicode_44i),
DLSYM_ARG(stringprep_ucs4_to_utf8),
DLSYM_ARG(stringprep_utf8_to_ucs4),
NULL);
DLSYM_ARG(stringprep_utf8_to_ucs4));
if (r < 0)
return r;