From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 22 Jun 2021 07:26:09 +0000 (+0200)
Subject: shared/dlfcn-util: add sentinel helper or for dlsym_many_or_warn()
X-Git-Tag: v249-rc2~23^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd503dbb6b4a6a6d505ce3ba2d449e418e5c415c;p=thirdparty%2Fsystemd.git

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

I didn't do this before to avoid churn in all the users.
---

diff --git a/src/shared/dlfcn-util.c b/src/shared/dlfcn-util.c
index c027e3396b0..a321df3c672 100644
--- a/src/shared/dlfcn-util.c
+++ b/src/shared/dlfcn-util.c
@@ -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;
 
diff --git a/src/shared/dlfcn-util.h b/src/shared/dlfcn-util.h
index 87585b406ac..d786d035d71 100644
--- a/src/shared/dlfcn-util.h
+++ b/src/shared/dlfcn-util.h
@@ -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)
 
diff --git a/src/shared/idn-util.c b/src/shared/idn-util.c
index 6dda3af54c3..d4108d0c8e3 100644
--- a/src/shared/idn-util.c
+++ b/src/shared/idn-util.c
@@ -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;