coccinelle/macros.h

@@ -165,7 +165,7 @@
         } while (false)
 
 #define LIST_JUST_US(name,item)                                         \
-        (!(item)->name##_prev && !(item)->name##_next)
+        (!(item)->name##_prev && !(item)->name##_next)                  \
 #define LIST_FOREACH(name,i,head)                                       \
         for ((i) = (head); (i); (i) = (i)->name##_next)
 #define LIST_FOREACH_SAFE(name,i,n,head)                                \

meson.build

@@ -1474,7 +1474,7 @@ conf.set10('PREFER_OPENSSL',
            opt == 'openssl' or (opt == 'auto' and conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_GCRYPT') == 0))
 conf.set10('HAVE_OPENSSL_OR_GCRYPT',
            conf.get('HAVE_OPENSSL') == 1 or conf.get('HAVE_GCRYPT') == 1)
-lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? [libopenssl] : [libgcrypt, libgpg_error]
+lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? libopenssl : libgcrypt
 
 dns_over_tls = get_option('dns-over-tls')
 if dns_over_tls != 'false'
@@ -2200,6 +2200,7 @@ if conf.get('ENABLE_RESOLVE') == 1
                              libsystemd_resolve_core],
                 dependencies : [threads,
                                 lib_openssl_or_gcrypt,
+                                libgpg_error,
                                 libm,
                                 libidn],
                 install_rpath : rootlibexecdir,

src/basic/list.h

@@ -134,7 +134,7 @@
         } while (false)
 
 #define LIST_JUST_US(name,item)                                         \
-        (!(item)->name##_prev && !(item)->name##_next)
+        (!(item)->name##_prev && !(item)->name##_next)                  \
 
 #define LIST_FOREACH(name,i,head)                                       \
         for ((i) = (head); (i); (i) = (i)->name##_next)

src/resolve/meson.build

@@ -135,7 +135,7 @@ systemd_resolved_sources += custom_target(
         output : 'resolved-dnssd-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
-systemd_resolved_dependencies = [threads, libm] + [lib_openssl_or_gcrypt]
+systemd_resolved_dependencies = [threads, libgpg_error, libm]
 if conf.get('ENABLE_DNS_OVER_TLS') == 1
         if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
                 systemd_resolved_sources += files(
@@ -178,12 +178,14 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
+          libgpg_error,
           libm]],
 
         [['src/resolve/test-dns-packet.c'],
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
+          libgpg_error,
           libm]],
 
         [['src/resolve/test-resolved-etc-hosts.c',
@@ -192,18 +194,21 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
+          libgpg_error,
           libm]],
 
         [['src/resolve/test-resolved-packet.c'],
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
+          libgpg_error,
           libm]],
 
         [['src/resolve/test-dnssec.c'],
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
+          libgpg_error,
           libm],
          [], 'HAVE_OPENSSL_OR_GCRYPT'],
 
@@ -211,6 +216,7 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
+          libgpg_error,
           libm],
          [], '', 'manual'],
 ]
@@ -220,5 +226,6 @@ fuzzers += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
+          libgpg_error,
           libm]],
 ]