meson.build

@@ -38,8 +38,8 @@ relative_source_path = run_command('realpath',
                                    project_source_root).stdout().strip()
 conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path)
 
-conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
-           description : 'tailor build to development or release builds')
+conf.set('BUILD_MODE', 'BUILD_MODE_' + get_option('mode').to_upper(),
+         description : 'tailor build to development or release builds')
 
 want_ossfuzz = get_option('oss-fuzz')
 want_libfuzzer = get_option('llvm-fuzz')
@@ -1117,7 +1117,7 @@ else
         libcurl = []
 endif
 conf.set10('HAVE_LIBCURL', have)
-conf.set10('CURL_NO_OLDIES', conf.get('BUILD_MODE_DEVELOPER') == 1)
+conf.set10('CURL_NO_OLDIES', get_option('mode') == 'developer')
 
 want_libidn = get_option('libidn')
 want_libidn2 = get_option('libidn2')
@@ -1232,7 +1232,7 @@ conf.set10('HAVE_LIBFIDO2', have)
 want_tpm2 = get_option('tpm2')
 if want_tpm2 != 'false' and not skip_deps
         tpm2 = dependency('tss2-esys tss2-rc tss2-mu',
-                          required : want_tpm2 == 'true')
+                              required : want_tpm2 == 'true')
         have = tpm2.found()
 else
         have = false
@@ -2329,7 +2329,7 @@ if conf.get('ENABLE_HOMED') == 1
 endif
 
 foreach alias : (['halt', 'poweroff', 'reboot', 'shutdown'] +
-                 (conf.get('HAVE_SYSV_COMPAT') == 1 ? ['runlevel', 'telinit'] : []))
+                (conf.get('HAVE_SYSV_COMPAT') == 1 ? ['runlevel', 'telinit'] : []))
         meson.add_install_script(meson_make_symlink,
                                  join_paths(rootbindir, 'systemctl'),
                                  join_paths(rootsbindir, alias))
@@ -2750,14 +2750,14 @@ if conf.get('ENABLE_OOMD') == 1
                    install_dir : rootlibexecdir)
 
         public_programs += executable(
-                'oomctl',
-                oomctl_sources,
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : [],
-                install_rpath : rootlibexecdir,
-                install : true,
-                install_dir : rootbindir)
+                   'oomctl',
+                   oomctl_sources,
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootbindir)
 endif
 
 if conf.get('ENABLE_BINFMT') == 1
@@ -3313,20 +3313,16 @@ custom_target(
         'systemd-runtest.env',
         output : 'systemd-runtest.env',
         command : ['sh', '-c', '{ ' +
-                               'echo SYSTEMD_TEST_DATA=@0@; '.format(join_paths(project_source_root, 'test')) +
-                               'echo SYSTEMD_CATALOG_DIR=@0@; '.format(join_paths(project_build_root, 'catalog')) +
-                               '} >@OUTPUT@'],
+                   'echo SYSTEMD_TEST_DATA=@0@; '.format(join_paths(project_source_root, 'test')) +
+                   'echo SYSTEMD_CATALOG_DIR=@0@; '.format(join_paths(project_build_root, 'catalog')) +
+                   '} >@OUTPUT@'],
         build_by_default : true)
 
-test_cflags = ['-DTEST_CODE=1']
-# We intentionally do not do inline initializations with definitions for a
-# bunch of _cleanup_ variables in tests, to ensure valgrind is triggered if we
-# use the variable unexpectedly. This triggers a lot of maybe-uninitialized
-# false positives when the combination of -O2 and -flto is used. Suppress them.
-if '-O2' in get_option('c_args') and '-flto=auto' in get_option('c_args')
-        test_cflags += cc.first_supported_argument('-Wno-maybe-uninitialized')
-endif
-
+# We intentionally do not do inline initializations with definitions for
+# a bunch of _cleanup_ variables in tests, to ensure valgrind is triggered.
+# This triggers a lot of maybe-uninitialized false positives when the
+# combination of -O2 and -flto is used. Suppress them.
+no_uninit = '-O2' in get_option('c_args') and '-flto=auto' in get_option('c_args') ? cc.first_supported_argument('-Wno-maybe-uninitialized') : []
 foreach tuple : tests
         sources = tuple[0]
         link_with = tuple.length() > 1 and tuple[1].length() > 0 ? tuple[1] : [libshared]
@@ -3335,7 +3331,7 @@ foreach tuple : tests
         condition = tuple.length() > 4 ? tuple[4] : ''
         type = tuple.length() > 5 ? tuple[5] : ''
         defs = tuple.length() > 6 ? tuple[6] : []
-        defs += test_cflags
+        defs += no_uninit
         parallel = tuple.length() > 7 ? tuple[7] : true
         timeout = 30
 
@@ -3403,7 +3399,7 @@ exe = executable(
         'test-libudev-sym',
         test_libudev_sym_c,
         include_directories : libudev_includes,
-        c_args : ['-Wno-deprecated-declarations'] + test_cflags,
+        c_args : ['-Wno-deprecated-declarations'] + no_uninit,
         link_with : [libudev],
         build_by_default : want_tests != 'false',
         install : install_tests,
@@ -3416,7 +3412,7 @@ exe = executable(
         'test-libudev-static-sym',
         test_libudev_sym_c,
         include_directories : libudev_includes,
-        c_args : ['-Wno-deprecated-declarations'] + test_cflags,
+        c_args : ['-Wno-deprecated-declarations'] + no_uninit,
         link_with : [install_libudev_static],
         build_by_default : want_tests != 'false' and static_libudev_pic,
         install : install_tests and static_libudev_pic,
@@ -3457,7 +3453,7 @@ foreach tuple : fuzzers
                 include_directories : [incs, include_directories('src/fuzz')],
                 link_with : link_with,
                 dependencies : dependencies,
-                c_args : defs + test_cflags,
+                c_args : defs,
                 link_args: link_args,
                 install : false,
                 build_by_default : fuzz_tests or fuzzer_build)
@@ -3644,7 +3640,7 @@ if dbus_docs.length() > 0
                            '@INPUT@'],
                 input : dbus_docs)
 
-        if conf.get('BUILD_MODE_DEVELOPER') == 1
+        if conf.get('BUILD_MODE') == 'BUILD_MODE_DEVELOPER'
                 test('dbus-docs-fresh',
                      update_dbus_docs_py,
                      args : ['--build-dir=@0@'.format(project_build_root),
@@ -3728,6 +3724,10 @@ alt_time_epoch = run_command('date', '-Is', '-u', '-d',
 status += [
         'time epoch:                        @0@ (@1@)'.format(time_epoch, alt_time_epoch)]
 
+status += [
+        'static libsystemd:                 @0@'.format(static_libsystemd),
+        'static libudev:                    @0@'.format(static_libudev)]
+
 # TODO:
 # CFLAGS:   ${OUR_CFLAGS} ${CFLAGS}
 # CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}
@@ -3750,112 +3750,107 @@ found = []
 missing = []
 
 foreach tuple : [
-        # dependencies
-        ['ACL'],
-        ['AUDIT'],
-        ['AppArmor'],
-        ['IMA'],
-        ['PAM'],
-        ['SECCOMP'],
-        ['SELinux'],
-        ['SMACK'],
-        ['blkid'],
-        ['elfutils'],
-        ['gcrypt'],
-        ['gnutls'],
         ['libcryptsetup'],
-        ['libcurl'],
-        ['libfdisk'],
-        ['libfido2'],
-        ['libidn'],
-        ['libidn2'],
-        ['libiptc'],
-        ['microhttpd'],
-        ['openssl'],
-        ['p11kit'],
-        ['pcre2'],
+        ['PAM'],
         ['pwquality'],
-        ['qrencode'],
+        ['libfdisk'],
+        ['p11kit'],
+        ['libfido2'],
         ['tpm2'],
-        ['xkbcommon'],
-
-        # compression libs
+        ['AUDIT'],
+        ['IMA'],
+        ['AppArmor'],
+        ['SELinux'],
+        ['SECCOMP'],
+        ['SMACK'],
+        ['zlib'],
+        ['xz'],
         ['zstd'],
         ['lz4'],
-        ['xz'],
-        ['zlib'],
         ['bzip2'],
-
-        # components
-        ['backlight'],
-        ['binfmt'],
-        ['coredump'],
-        ['environment.d'],
-        ['efi'],
-        ['gnu-efi',               have_gnu_efi],
-        ['firstboot'],
-        ['hibernate'],
-        ['homed'],
-        ['hostnamed'],
-        ['hwdb'],
-        ['importd'],
+        ['ACL'],
+        ['gcrypt'],
+        ['qrencode'],
+        ['microhttpd'],
+        ['gnutls'],
+        ['openssl'],
+        ['libcurl'],
+        ['idn'],
         ['initrd'],
-        ['kernel-install',        get_option('kernel-install')],
-        ['localed'],
+        ['compat-mutable-uid-boundaries'],
+        ['nscd'],
+        ['libidn2'],
+        ['libidn'],
+        ['libiptc'],
+        ['elfutils'],
+        ['binfmt'],
+        ['repart'],
+        ['vconsole'],
+        ['quotacheck'],
+        ['tmpfiles'],
+        ['environment.d'],
+        ['sysusers'],
+        ['firstboot'],
+        ['randomseed'],
+        ['backlight'],
+        ['rfkill'],
+        ['xdg-autostart'],
         ['logind'],
         ['machined'],
+        ['portabled'],
+        ['sysext'],
+        ['userdb'],
+        ['homed'],
+        ['importd'],
+        ['hostnamed'],
+        ['timedated'],
+        ['timesyncd'],
+        ['localed'],
         ['networkd'],
+        ['resolve'],
+        ['DNS-over-TLS(gnutls)',  conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1],
+        ['DNS-over-TLS(openssl)', conf.get('DNS_OVER_TLS_USE_OPENSSL') == 1],
+        ['coredump'],
+        ['pstore'],
+        ['oomd'],
+        ['polkit'],
+        ['legacy pkla',      install_polkit_pkla],
+        ['efi'],
+        ['gnu-efi',          have_gnu_efi],
+        ['kmod'],
+        ['xkbcommon'],
+        ['pcre2'],
+        ['blkid'],
+        ['dbus'],
+        ['glib'],
         ['nss-myhostname'],
         ['nss-mymachines'],
         ['nss-resolve'],
         ['nss-systemd'],
-        ['oomd'],
-        ['portabled'],
-        ['pstore'],
-        ['quotacheck'],
-        ['randomseed'],
-        ['repart'],
-        ['resolve'],
-        ['rfkill'],
-        ['sysext'],
-        ['systemd-analyze',       conf.get('ENABLE_ANALYZE') == 1],
-        ['sysusers'],
-        ['timedated'],
-        ['timesyncd'],
-        ['tmpfiles'],
-        ['userdb'],
-        ['vconsole'],
-        ['xdg-autostart'],
-
-        # optional features
-        ['idn'],
-        ['polkit'],
-        ['nscd'],
-        ['legacy-pkla',           install_polkit_pkla],
-        ['kmod'],
-        ['dbus'],
-        ['glib'],
+        ['hwdb'],
         ['tpm'],
-        ['man pages',             want_man],
-        ['html pages',            want_html],
-        ['man page indices',      want_man and have_lxml],
+        ['man pages',        want_man],
+        ['html pages',       want_html],
+        ['man page indices', want_man and have_lxml],
         ['SysV compat'],
-        ['compat-mutable-uid-boundaries'],
         ['utmp'],
         ['ldconfig'],
-        ['adm group',             get_option('adm-group')],
-        ['wheel group',           get_option('wheel-group')],
+        ['hibernate'],
+        ['adm group',        get_option('adm-group')],
+        ['wheel group',      get_option('wheel-group')],
         ['gshadow'],
         ['debug hashmap'],
         ['debug mmap cache'],
         ['debug siphash'],
-        ['valgrind',              conf.get('VALGRIND') == 1],
-        ['trace logging',         conf.get('LOG_TRACE') == 1],
-        ['install tests',         install_tests],
+        ['valgrind',         conf.get('VALGRIND') == 1],
+        ['trace logging',    conf.get('LOG_TRACE') == 1],
+        ['install tests',    install_tests],
         ['link-udev-shared',      get_option('link-udev-shared')],
         ['link-systemctl-shared', get_option('link-systemctl-shared')],
         ['link-networkd-shared',  get_option('link-networkd-shared')],
         ['link-timesyncd-shared', get_option('link-timesyncd-shared')],
+        ['kernel-install',        get_option('kernel-install')],
+        ['systemd-analyze',  conf.get('ENABLE_ANALYZE') == 1],
         ['fexecve'],
         ['standalone-binaries',   get_option('standalone-binaries')],
 ]
@@ -3874,26 +3869,6 @@ foreach tuple : [
         endif
 endforeach
 
-if static_libsystemd == 'false'
-        missing += 'static-libsystemd'
-else
-        found += 'static-libsystemd(@0@)'.format(static_libsystemd)
-endif
-
-if static_libudev == 'false'
-        missing += 'static-libudev'
-else
-        found += 'static-libudev(@0@)'.format(static_libudev)
-endif
-
-if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
-        found += 'DNS-over-TLS(gnutls)'
-elif conf.get('DNS_OVER_TLS_USE_OPENSSL') == 1
-        found += 'DNS-over-TLS(openssl)'
-else
-        missing += 'DNS-over-TLS'
-endif
-
 status += [
         '',
         'enabled features: @0@'.format(', '.join(found)),

src/analyze/analyze.c

@@ -15,6 +15,7 @@
 #include "analyze-condition.h"
 #include "analyze-security.h"
 #include "analyze-verify.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
@@ -52,7 +53,6 @@
 #include "unit-name.h"
 #include "util.h"
 #include "verbs.h"
-#include "version.h"
 
 #define SCALE_X (0.1 / 1000.0) /* pixels per us */
 #define SCALE_Y (20.0)

src/basic/build.h

@@ -4,3 +4,8 @@
 #include "version.h"
 
 extern const char* const systemd_features;
+
+enum {
+        BUILD_MODE_DEVELOPER,
+        BUILD_MODE_RELEASE,
+};

src/basic/fileio.c

@@ -286,7 +286,7 @@ fail:
         /* OK, the operation failed, but let's see if the right
          * contents in place already. If so, eat up the error. */
 
-        q = verify_file(fn, line, !(flags & WRITE_STRING_FILE_AVOID_NEWLINE) || (flags & WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE));
+        q = verify_file(fn, line, !(flags & WRITE_STRING_FILE_AVOID_NEWLINE));
         if (q <= 0)
                 return r;
 

src/basic/fileio.h

@@ -15,17 +15,16 @@
 #define LONG_LINE_MAX (1U*1024U*1024U)
 
 typedef enum {
-        WRITE_STRING_FILE_CREATE                = 1 << 0,
-        WRITE_STRING_FILE_TRUNCATE              = 1 << 1,
-        WRITE_STRING_FILE_ATOMIC                = 1 << 2,
-        WRITE_STRING_FILE_AVOID_NEWLINE         = 1 << 3,
-        WRITE_STRING_FILE_VERIFY_ON_FAILURE     = 1 << 4,
-        WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE = 1 << 5,
-        WRITE_STRING_FILE_SYNC                  = 1 << 6,
-        WRITE_STRING_FILE_DISABLE_BUFFER        = 1 << 7,
-        WRITE_STRING_FILE_NOFOLLOW              = 1 << 8,
-        WRITE_STRING_FILE_MKDIR_0755            = 1 << 9,
-        WRITE_STRING_FILE_MODE_0600             = 1 << 10,
+        WRITE_STRING_FILE_CREATE            = 1 << 0,
+        WRITE_STRING_FILE_TRUNCATE          = 1 << 1,
+        WRITE_STRING_FILE_ATOMIC            = 1 << 2,
+        WRITE_STRING_FILE_AVOID_NEWLINE     = 1 << 3,
+        WRITE_STRING_FILE_VERIFY_ON_FAILURE = 1 << 4,
+        WRITE_STRING_FILE_SYNC              = 1 << 5,
+        WRITE_STRING_FILE_DISABLE_BUFFER    = 1 << 6,
+        WRITE_STRING_FILE_NOFOLLOW          = 1 << 7,
+        WRITE_STRING_FILE_MKDIR_0755        = 1 << 8,
+        WRITE_STRING_FILE_MODE_0600         = 1 << 9,
 
         /* And before you wonder, why write_string_file_atomic_label_ts() is a separate function instead of just one
            more flag here: it's about linking: we don't want to pull -lselinux into all users of write_string_file()

src/basic/log.h

@@ -4,7 +4,6 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <string.h>
 #include <syslog.h>
 
 #include "macro.h"
@@ -189,39 +188,20 @@ void log_assert_failed_return(
         log_dispatch_internal(level, error, PROJECT_FILE, __LINE__, __func__, NULL, NULL, NULL, NULL, buffer)
 
 /* Logging with level */
-#define log_full_errno_zerook(level, error, ...)                        \
-        ({                                                              \
-                int _level = (level), _e = (error);                     \
-                _e = (log_get_max_level() >= LOG_PRI(_level))           \
-                        ? log_internal(_level, _e, PROJECT_FILE, __LINE__, __func__, __VA_ARGS__) \
-                        : -ERRNO_VALUE(_e);                             \
-                _e < 0 ? _e : -EIO;                                     \
-        })
-
-#if BUILD_MODE_DEVELOPER && !defined(TEST_CODE)
-#  define ASSERT_NON_ZERO(x) assert((x) != 0)
-#else
-#  define ASSERT_NON_ZERO(x)
-#endif
-
 #define log_full_errno(level, error, ...)                               \
         ({                                                              \
-                int _error = (error);                                   \
-                ASSERT_NON_ZERO(_error);                                \
-                log_full_errno_zerook(level, _error, __VA_ARGS__);      \
+                int _level = (level), _e = (error);                     \
+                (log_get_max_level() >= LOG_PRI(_level))                \
+                        ? log_internal(_level, _e, PROJECT_FILE, __LINE__, __func__, __VA_ARGS__) \
+                        : -ERRNO_VALUE(_e);                             \
         })
 
-#define log_full(level, fmt, ...)                                      \
-        ({                                                             \
-                if (BUILD_MODE_DEVELOPER)                              \
-                        assert(!strstr(fmt, "%m"));                    \
-                (void) log_full_errno_zerook(level, 0, fmt, ##__VA_ARGS__); \
-        })
+#define log_full(level, ...) (void) log_full_errno((level), 0, __VA_ARGS__)
 
 int log_emergency_level(void);
 
 /* Normal logging */
-#define log_debug(...)     log_full(LOG_DEBUG,   __VA_ARGS__)
+#define log_debug(...)     log_full_errno(LOG_DEBUG, 0, __VA_ARGS__)
 #define log_info(...)      log_full(LOG_INFO,    __VA_ARGS__)
 #define log_notice(...)    log_full(LOG_NOTICE,  __VA_ARGS__)
 #define log_warning(...)   log_full(LOG_WARNING, __VA_ARGS__)

src/basic/missing_capability.h

@@ -27,7 +27,7 @@
 
 #ifdef CAP_LAST_CAP
 #  if CAP_LAST_CAP > SYSTEMD_CAP_LAST_CAP
-#    if BUILD_MODE_DEVELOPER && defined(TEST_CAPABILITY_C)
+#    if BUILD_MODE == BUILD_MODE_DEVELOPER && defined(TEST_CAPABILITY_C)
 #      warning "The capability list here is outdated"
 #    endif
 #  else

src/core/bpf-devices.c

@@ -216,7 +216,7 @@ int bpf_devices_apply_policy(
         _cleanup_free_ char *controller_path = NULL;
         int r;
 
-        /* This will assign *prog_installed if everything goes well. */
+        /* This will assign *keep_program if everything goes well. */
 
         if (!prog)
                 goto finish;

src/core/load-fragment.c

@@ -2015,7 +2015,7 @@ int config_parse_trigger_unit(
         assert(rvalue);
         assert(data);
 
-        if (UNIT_TRIGGER(u)) {
+        if (!hashmap_isempty(u->dependencies[UNIT_TRIGGERS])) {
                 log_syntax(unit, LOG_WARNING, filename, line, 0, "Multiple units to trigger specified, ignoring: %s", rvalue);
                 return 0;
         }

src/core/path.c

@@ -316,7 +316,7 @@ static int path_add_trigger_dependencies(Path *p) {
 
         assert(p);
 
-        if (UNIT_TRIGGER(UNIT(p)))
+        if (!hashmap_isempty(UNIT(p)->dependencies[UNIT_TRIGGERS]))
                 return 0;
 
         r = unit_load_related_unit(UNIT(p), ".service", &x);

src/core/selinux-access.c

@@ -273,9 +273,8 @@ int mac_selinux_generic_access_check(
                         sd_bus_error_set(error, SD_BUS_ERROR_ACCESS_DENIED, "SELinux policy denies access.");
         }
 
-        log_full_errno_zerook(LOG_DEBUG, r,
-                              "SELinux access check scon=%s tcon=%s tclass=%s perm=%s state=%s path=%s cmdline=%s: %m",
-                              scon, fcon, tclass, permission, enforce ? "enforcing" : "permissive", path, cl);
+        log_debug_errno(r, "SELinux access check scon=%s tcon=%s tclass=%s perm=%s state=%s path=%s cmdline=%s: %m",
+                        scon, fcon, tclass, permission, enforce ? "enforcing" : "permissive", path, cl);
         return enforce ? r : 0;
 }
 

src/core/timer.c

@@ -124,7 +124,7 @@ static int timer_add_trigger_dependencies(Timer *t) {
 
         assert(t);
 
-        if (UNIT_TRIGGER(UNIT(t)))
+        if (!hashmap_isempty(UNIT(t)->dependencies[UNIT_TRIGGERS]))
                 return 0;
 
         r = unit_load_related_unit(UNIT(t), ".service", &x);

src/import/curl-util.c

@@ -3,11 +3,11 @@
 #include <fcntl.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "curl-util.h"
 #include "fd-util.h"
 #include "locale-util.h"
 #include "string-util.h"
-#include "version.h"
 
 static void curl_glue_check_finished(CurlGlue *g) {
         CURLMsg *msg;

src/journal-remote/journal-upload.c

@@ -9,6 +9,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "conf-parser.h"
 #include "daemon-util.h"
 #include "def.h"
@@ -33,7 +34,6 @@
 #include "strv.h"
 #include "tmpfile-util.h"
 #include "util.h"
-#include "version.h"
 
 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem"
 #define CERT_FILE     CERTIFICATE_ROOT "/certs/journal-upload.pem"

src/journal/journald-kmsg.c

@@ -376,8 +376,8 @@ int server_open_dev_kmsg(Server *s) {
 
         s->dev_kmsg_fd = open("/dev/kmsg", mode);
         if (s->dev_kmsg_fd < 0) {
-                log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_WARNING,
-                               errno, "Failed to open /dev/kmsg, ignoring: %m");
+                log_full(errno == ENOENT ? LOG_DEBUG : LOG_WARNING,
+                         "Failed to open /dev/kmsg, ignoring: %m");
                 return 0;
         }
 

src/libsystemd-network/dhcp-internal.h

@@ -66,13 +66,15 @@ int dhcp_packet_verify_headers(DHCPPacket *packet, size_t len, bool checksum, ui
 #define DHCP_CLIENT_DONT_DESTROY(client) \
         _cleanup_(sd_dhcp_client_unrefp) _unused_ sd_dhcp_client *_dont_destroy_##client = sd_dhcp_client_ref(client)
 
-#define log_dhcp_client_errno(client, error, fmt, ...)          \
-        log_interface_prefix_full_errno(                        \
-                "DHCPv4 client: ",                              \
-                sd_dhcp_client_get_ifname(client),              \
-                error, fmt, ##__VA_ARGS__)
+#define log_dhcp_client_errno(client, error, fmt, ...)                  \
+        ({                                                              \
+                int _e = (error);                                       \
+                if (DEBUG_LOGGING)                                      \
+                        log_interface_full_errno(                       \
+                                sd_dhcp_client_get_ifname(client),      \
+                                LOG_DEBUG, _e, "DHCPv4 client: " fmt,   \
+                                ##__VA_ARGS__);                         \
+                -ERRNO_VALUE(_e);                                       \
+        })
 #define log_dhcp_client(client, fmt, ...)                       \
-        log_interface_prefix_full_errno_zerook(                 \
-                "DHCPv4 client: ",                              \
-                sd_dhcp_client_get_ifname(client),              \
-                0, fmt, ##__VA_ARGS__)
+        log_dhcp_client_errno(client, 0, fmt, ##__VA_ARGS__)

src/libsystemd-network/dhcp-server-internal.h

@@ -98,13 +98,15 @@ int dhcp_server_send_packet(sd_dhcp_server *server,
 void client_id_hash_func(const DHCPClientId *p, struct siphash *state);
 int client_id_compare_func(const DHCPClientId *a, const DHCPClientId *b);
 
-#define log_dhcp_server_errno(server, error, fmt, ...)          \
-        log_interface_prefix_full_errno(                        \
-                "DHCPv4 server: ",                              \
-                sd_dhcp_server_get_ifname(server),              \
-                error, fmt, ##__VA_ARGS__)
+#define log_dhcp_server_errno(server, error, fmt, ...)                  \
+        ({                                                              \
+                int _e = (error);                                       \
+                if (DEBUG_LOGGING)                                      \
+                        log_interface_full_errno(                       \
+                                    sd_dhcp_server_get_ifname(server),  \
+                                    LOG_DEBUG, _e, "DHCPv4 server: " fmt, \
+                                    ##__VA_ARGS__);                     \
+                -ERRNO_VALUE(_e);                                       \
+        })
 #define log_dhcp_server(server, fmt, ...)                       \
-        log_interface_prefix_full_errno_zerook(                 \
-                "DHCPv4 server: ",                              \
-                sd_dhcp_server_get_ifname(server),              \
-                0, fmt, ##__VA_ARGS__)
+        log_dhcp_server_errno(server, 0, fmt, ##__VA_ARGS__)

src/libsystemd-network/dhcp6-internal.h

@@ -119,13 +119,15 @@ int dhcp6_message_type_from_string(const char *s) _pure_;
 const char *dhcp6_message_status_to_string(int s) _const_;
 int dhcp6_message_status_from_string(const char *s) _pure_;
 
-#define log_dhcp6_client_errno(client, error, fmt, ...)         \
-        log_interface_prefix_full_errno(                        \
-                "DHCPv6 client: ",                              \
-                sd_dhcp6_client_get_ifname(client),             \
-                error, fmt, ##__VA_ARGS__)
-#define log_dhcp6_client(client, fmt, ...)                      \
-        log_interface_prefix_full_errno_zerook(                 \
-                "DHCPv6 client: ",                              \
-                sd_dhcp6_client_get_ifname(client),             \
-                0, fmt, ##__VA_ARGS__)
+#define log_dhcp6_client_errno(client, error, fmt, ...)                 \
+        ({                                                              \
+                int _e = (error);                                       \
+                if (DEBUG_LOGGING)                                      \
+                        log_interface_full_errno(                       \
+                                    sd_dhcp6_client_get_ifname(client), \
+                                    LOG_DEBUG, _e, "DHCPv6 client: " fmt, \
+                                    ##__VA_ARGS__);                     \
+                -ERRNO_VALUE(_e);                                       \
+        })
+#define log_dhcp6_client(client, fmt, ...)                       \
+        log_dhcp6_client_errno(client, 0, fmt, ##__VA_ARGS__)

src/libsystemd-network/lldp-internal.h

@@ -36,13 +36,15 @@ struct sd_lldp {
 const char* lldp_event_to_string(sd_lldp_event_t e) _const_;
 sd_lldp_event_t lldp_event_from_string(const char *s) _pure_;
 
-#define log_lldp_errno(lldp, error, fmt, ...)           \
-        log_interface_prefix_full_errno(                \
-                "LLDP: ",                               \
-                sd_lldp_get_ifname(lldp),               \
-                error, fmt, ##__VA_ARGS__)
-#define log_lldp(lldp, fmt, ...)                        \
-        log_interface_prefix_full_errno_zerook(         \
-                "LLDP: ",                               \
-                sd_lldp_get_ifname(lldp),               \
-                0, fmt, ##__VA_ARGS__)
+#define log_lldp_errno(lldp, error, fmt, ...)                           \
+        ({                                                              \
+                int _e = (error);                                       \
+                if (DEBUG_LOGGING)                                      \
+                        log_interface_full_errno(                       \
+                                    sd_lldp_get_ifname(lldp),           \
+                                    LOG_DEBUG, _e, "LLDP: " fmt,        \
+                                    ##__VA_ARGS__);                     \
+                -ERRNO_VALUE(_e);                                       \
+        })
+#define log_lldp(lldp, fmt, ...)                       \
+        log_lldp_errno(lldp, 0, fmt, ##__VA_ARGS__)

src/libsystemd-network/ndisc-internal.h

@@ -41,13 +41,15 @@ struct sd_ndisc {
 const char* ndisc_event_to_string(sd_ndisc_event_t e) _const_;
 sd_ndisc_event_t ndisc_event_from_string(const char *s) _pure_;
 
-#define log_ndisc_errno(ndisc, error, fmt, ...)         \
-        log_interface_prefix_full_errno(                \
-                "NDISC: ",                              \
-                sd_ndisc_get_ifname(ndisc),             \
-                error, fmt, ##__VA_ARGS__)
-#define log_ndisc(ndisc, fmt, ...)                      \
-        log_interface_prefix_full_errno_zerook(         \
-                "NDISC: ",                              \
-                sd_ndisc_get_ifname(ndisc),             \
-                0, fmt, ##__VA_ARGS__)
+#define log_ndisc_errno(ndisc, error, fmt, ...)                         \
+        ({                                                              \
+                int _e = (error);                                       \
+                if (DEBUG_LOGGING)                                      \
+                        log_interface_full_errno(                       \
+                                    sd_ndisc_get_ifname(ndisc),         \
+                                    LOG_DEBUG, _e, "NDISC: " fmt,       \
+                                    ##__VA_ARGS__);                     \
+                -ERRNO_VALUE(_e);                                       \
+        })
+#define log_ndisc(ndisc, fmt, ...)                       \
+        log_ndisc_errno(ndisc, 0, fmt, ##__VA_ARGS__)

src/libsystemd-network/radv-internal.h

@@ -125,13 +125,15 @@ struct sd_radv_route_prefix {
         LIST_FIELDS(struct sd_radv_route_prefix, prefix);
 };
 
-#define log_radv_errno(radv, error, fmt, ...)           \
-        log_interface_prefix_full_errno(                \
-                "RADV: ",                               \
-                sd_radv_get_ifname(radv),               \
-                error, fmt, ##__VA_ARGS__)
-#define log_radv(radv, fmt, ...)                        \
-        log_interface_prefix_full_errno_zerook(         \
-                "RADV: ",                               \
-                sd_radv_get_ifname(radv),               \
-                0, fmt, ##__VA_ARGS__)
+#define log_radv_errno(radv, error, fmt, ...)                           \
+        ({                                                              \
+                int _e = (error);                                       \
+                if (DEBUG_LOGGING)                                      \
+                        log_interface_full_errno(                       \
+                                    sd_radv_get_ifname(radv),           \
+                                    LOG_DEBUG, _e, "RADV: " fmt,        \
+                                    ##__VA_ARGS__);                     \
+                -ERRNO_VALUE(_e);                                       \
+        })
+#define log_radv(radv, fmt, ...)                       \
+        log_radv_errno(radv, 0, fmt, ##__VA_ARGS__)

src/libsystemd-network/sd-ipv4acd.c

@@ -75,16 +75,18 @@ struct sd_ipv4acd {
         void* userdata;
 };
 
-#define log_ipv4acd_errno(acd, error, fmt, ...)         \
-        log_interface_prefix_full_errno(                \
-                "IPv4ACD: ",                            \
-                sd_ipv4acd_get_ifname(acd),             \
-                error, fmt, ##__VA_ARGS__)
+#define log_ipv4acd_errno(acd, error, fmt, ...)                         \
+        ({                                                              \
+                int _e = (error);                                       \
+                if (DEBUG_LOGGING)                                      \
+                        log_interface_full_errno(                       \
+                                    sd_ipv4acd_get_ifname(acd),         \
+                                    LOG_DEBUG, _e, "IPv4ACD: " fmt,     \
+                                    ##__VA_ARGS__);                     \
+                -ERRNO_VALUE(_e);                                       \
+        })
 #define log_ipv4acd(acd, fmt, ...)                      \
-        log_interface_prefix_full_errno_zerook(         \
-                "IPv4ACD: ",                            \
-                sd_ipv4acd_get_ifname(acd),             \
-                0, fmt, ##__VA_ARGS__)
+        log_ipv4acd_errno(acd, 0, fmt, ##__VA_ARGS__)
 
 static const char * const ipv4acd_state_table[_IPV4ACD_STATE_MAX] = {
         [IPV4ACD_STATE_INIT]             = "init",

src/libsystemd-network/sd-ipv4ll.c

@@ -49,16 +49,18 @@ struct sd_ipv4ll {
         void* userdata;
 };
 
-#define log_ipv4ll_errno(ll, error, fmt, ...)           \
-        log_interface_prefix_full_errno(                \
-                "IPv4LL: ",                             \
-                sd_ipv4ll_get_ifname(ll),               \
-                error, fmt, ##__VA_ARGS__)
+#define log_ipv4ll_errno(ll, error, fmt, ...)                           \
+        ({                                                              \
+                int _e = (error);                                       \
+                if (DEBUG_LOGGING)                                      \
+                        log_interface_full_errno(                       \
+                                    sd_ipv4ll_get_ifname(ll),           \
+                                    LOG_DEBUG, _e, "IPv4LL: " fmt,      \
+                                    ##__VA_ARGS__);                     \
+                -ERRNO_VALUE(_e);                                       \
+        })
 #define log_ipv4ll(ll, fmt, ...)                        \
-        log_interface_prefix_full_errno_zerook(         \
-                "IPv4LL: ",                             \
-                sd_ipv4ll_get_ifname(ll),               \
-                0, fmt, ##__VA_ARGS__)
+        log_ipv4ll_errno(ll, 0, fmt, ##__VA_ARGS__)
 
 static void ipv4ll_on_acd(sd_ipv4acd *ll, int event, void *userdata);
 

src/libsystemd/sd-device/device-util.h

@@ -45,29 +45,22 @@
              device;                                                        \
              device = sd_device_enumerator_get_subsystem_next(enumerator))
 
-#define log_device_full_errno_zerook(device, level, error, ...)         \
+#define log_device_full_errno(device, level, error, ...)                \
         ({                                                              \
                 const char *_sysname = NULL;                            \
                 sd_device *_d = (device);                               \
-                int _level = (level), _e = (error);                     \
+                int _level = (level), _error = (error);                 \
                                                                         \
                 if (_d && _unlikely_(log_get_max_level() >= LOG_PRI(_level))) \
                         (void) sd_device_get_sysname(_d, &_sysname);    \
-                log_object_internal(_level, _e, PROJECT_FILE, __LINE__, __func__, \
+                log_object_internal(_level, _error, PROJECT_FILE, __LINE__, __func__, \
                                     _sysname ? "DEVICE=" : NULL, _sysname, \
                                     NULL, NULL, __VA_ARGS__);           \
         })
 
-#define log_device_full_errno(device, level, error, ...)                \
-        ({                                                              \
-                int _error = (error);                                   \
-                ASSERT_NON_ZERO(_error);                                \
-                log_device_full_errno_zerook(device, level, _error, __VA_ARGS__); \
-        })
+#define log_device_full(device, level, ...) (void) log_device_full_errno(device, level, 0, __VA_ARGS__)
 
-#define log_device_full(device, level, ...) (void) log_device_full_errno_zerook(device, level, 0, __VA_ARGS__)
-
-#define log_device_debug(device, ...)   log_device_full(device, LOG_DEBUG, __VA_ARGS__)
+#define log_device_debug(device, ...)   log_device_full_errno(device, LOG_DEBUG, 0, __VA_ARGS__)
 #define log_device_info(device, ...)    log_device_full(device, LOG_INFO, __VA_ARGS__)
 #define log_device_notice(device, ...)  log_device_full(device, LOG_NOTICE, __VA_ARGS__)
 #define log_device_warning(device, ...) log_device_full(device, LOG_WARNING, __VA_ARGS__)

src/libsystemd/sd-device/sd-device.c

@@ -178,12 +178,13 @@ int device_set_syspath(sd_device *device, const char *_syspath, bool verify) {
 
                         /* all 'devices' require an 'uevent' file */
                         path = strjoina(syspath, "/uevent");
-                        if (access(path, F_OK) < 0) {
+                        r = access(path, F_OK);
+                        if (r < 0) {
                                 if (errno == ENOENT)
                                         /* this is not a valid device */
                                         return -ENODEV;
 
-                                return log_debug_errno(errno, "sd-device: cannot access uevent file for %s: %m", syspath);
+                                return log_debug_errno(errno, "sd-device: %s does not have an uevent file: %m", syspath);
                         }
                 } else {
                         /* everything else just needs to be a directory */

src/libudev/test-libudev.c

@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "fd-util.h"
 #include "libudev-list-internal.h"
 #include "libudev-util.h"
@@ -14,7 +15,6 @@
 #include "stdio-util.h"
 #include "string-util.h"
 #include "tests.h"
-#include "version.h"
 
 static bool arg_monitor = false;
 

src/login/logind.c

@@ -268,8 +268,8 @@ static int manager_enumerate_seats(Manager *m) {
                 s = hashmap_get(m->seats, de->d_name);
                 if (!s) {
                         if (unlinkat(dirfd(d), de->d_name, 0) < 0)
-                                log_warning_errno(errno, "Failed to remove /run/systemd/seats/%s: %m",
-                                                  de->d_name);
+                                log_warning("Failed to remove /run/systemd/seats/%s: %m",
+                                            de->d_name);
                         continue;
                 }
 

src/network/networkd-mdb.c

@@ -208,10 +208,8 @@ int link_set_bridge_mdb(Link *link) {
         if (hashmap_isempty(link->network->mdb_entries_by_section))
                 goto finish;
 
-        if (!link_has_carrier(link)) {
-                log_link_debug(link, "Link does not have carrier yet, setting MDB entries later.");
-                return 0;
-        }
+        if (!link_has_carrier(link))
+                return log_link_debug(link, "Link does not have carrier yet, setting MDB entries later.");
 
         if (link->network->bridge) {
                 Link *master;
@@ -220,10 +218,8 @@ int link_set_bridge_mdb(Link *link) {
                 if (r < 0)
                         return log_link_error_errno(link, r, "Failed to get Link object for Bridge=%s", link->network->bridge->ifname);
 
-                if (!link_has_carrier(master)) {
-                        log_link_debug(link, "Bridge interface %s does not have carrier yet, setting MDB entries later.", link->network->bridge->ifname);
-                        return 0;
-                }
+                if (!link_has_carrier(master))
+                        return log_link_debug(link, "Bridge interface %s does not have carrier yet, setting MDB entries later.", link->network->bridge->ifname);
 
         } else if (!streq_ptr(link->kind, "bridge")) {
                 log_link_warning(link, "Link is neither a bridge master nor a bridge port, ignoring [BridgeMDB] sections.");

src/network/networkd-nexthop.c

@@ -711,10 +711,8 @@ int manager_rtnl_process_nexthop(sd_netlink *rtnl, sd_netlink_message *message,
         if (r < 0) {
                 log_link_warning_errno(link, r, "rtnl: could not get nexthop family, ignoring: %m");
                 return 0;
-        } else if (!IN_SET(tmp->family, AF_INET, AF_INET6)) {
-                log_link_debug(link, "rtnl: received nexthop message with invalid family %d, ignoring.", tmp->family);
-                return 0;
-        }
+        } else if (!IN_SET(tmp->family, AF_INET, AF_INET6))
+                return log_link_debug(link, "rtnl: received nexthop message with invalid family %d, ignoring.", tmp->family);
 
         r = sd_rtnl_message_nexthop_get_protocol(message, &tmp->protocol);
         if (r < 0) {

src/partition/repart.c

@@ -3830,7 +3830,7 @@ static int parse_efi_variable_factory_reset(void) {
 
         arg_factory_reset = r;
         if (r)
-                log_notice("Factory reset requested via EFI variable FactoryReset.");
+                log_notice("Honouring factory reset requested via EFI variable FactoryReset: %m");
 
         return 0;
 }

src/random-seed/random-seed.c

@@ -262,7 +262,7 @@ static int run(int argc, char *argv[]) {
                 if (k < 0)
                         log_debug_errno(errno, "Failed to read random data with getrandom(), falling back to /dev/urandom: %m");
                 else if ((size_t) k < buf_size)
-                        log_debug("Short read from getrandom(), falling back to /dev/urandom.");
+                        log_debug("Short read from getrandom(), falling back to /dev/urandom: %m");
                 else
                         getrandom_worked = true;
 

src/shared/bus-wait-for-jobs.c

@@ -306,8 +306,7 @@ int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet, const char* const* extra_ar
                         if (q < 0 && r == 0)
                                 r = q;
 
-                        log_full_errno_zerook(LOG_DEBUG, q,
-                                              "Got result %s/%m for job %s", d->result, d->name);
+                        log_debug_errno(q, "Got result %s/%m for job %s", d->result, d->name);
                 }
 
                 d->name = mfree(d->name);

src/shared/log-link.h

@@ -3,38 +3,13 @@
 
 #include "log.h"
 
-#define log_interface_full_errno_zerook(ifname, level, error, ...)      \
+#define log_interface_full_errno(ifname, level, error, ...)             \
         ({                                                              \
                 const char *_ifname = (ifname);                         \
                 _ifname ? log_object_internal(level, error, PROJECT_FILE, __LINE__, __func__, "INTERFACE=", _ifname, NULL, NULL, ##__VA_ARGS__) : \
                         log_internal(level, error, PROJECT_FILE, __LINE__, __func__, ##__VA_ARGS__); \
         })
 
-#define log_interface_full_errno(ifname, level, error, ...)             \
-        ({                                                              \
-                int _error = (error);                                   \
-                ASSERT_NON_ZERO(_error);                                \
-                log_interface_full_errno_zerook(ifname, level, _error, __VA_ARGS__); \
-        })
-
-#define log_interface_prefix_full_errno_zerook(prefix, ifname_expr, error, fmt, ...) \
-        ({                                                              \
-                int _e = (error);                                       \
-                if (DEBUG_LOGGING)                                      \
-                        log_interface_full_errno_zerook(                \
-                                ifname_expr,                            \
-                                LOG_DEBUG, _e, prefix fmt,              \
-                                ##__VA_ARGS__);                         \
-                -ERRNO_VALUE(_e);                                       \
-        })
-
-#define log_interface_prefix_full_errno(prefix, ifname_expr, error, fmt, ...) \
-        ({                                                              \
-                int _error = (error);                                   \
-                ASSERT_NON_ZERO(_error);                                \
-                log_interface_prefix_full_errno_zerook(prefix, ifname_expr, _error, fmt, ##__VA_ARGS__); \
-        })
-
 /*
  * The following macros append INTERFACE= to the message.
  * The macros require a struct named 'Link' which contains 'char *ifname':
@@ -46,22 +21,15 @@
  * See, network/networkd-link.h for example.
  */
 
-#define log_link_full_errno_zerook(link, level, error, ...)             \
-        ({                                                              \
-                const Link *_l = (link);                                \
-                log_interface_full_errno_zerook(_l ? _l->ifname : NULL, level, error, __VA_ARGS__); \
-        })
-
 #define log_link_full_errno(link, level, error, ...)                    \
         ({                                                              \
-                int _error = (error);                                   \
-                ASSERT_NON_ZERO(_error);                                \
-                log_link_full_errno_zerook(link, level, _error, __VA_ARGS__); \
+                const Link *_l = (link);                                \
+                log_interface_full_errno(_l ? _l->ifname : NULL, level, error, ##__VA_ARGS__); \
         })
 
-#define log_link_full(link, level, ...) (void) log_link_full_errno_zerook(link, level, 0, __VA_ARGS__)
+#define log_link_full(link, level, ...) (void) log_link_full_errno(link, level, 0, __VA_ARGS__)
 
-#define log_link_debug(link, ...)   log_link_full(link, LOG_DEBUG, __VA_ARGS__)
+#define log_link_debug(link, ...)   log_link_full_errno(link, LOG_DEBUG, 0, __VA_ARGS__)
 #define log_link_info(link, ...)    log_link_full(link, LOG_INFO, __VA_ARGS__)
 #define log_link_notice(link, ...)  log_link_full(link, LOG_NOTICE, __VA_ARGS__)
 #define log_link_warning(link, ...) log_link_full(link, LOG_WARNING, __VA_ARGS__)

src/shared/module-util.c

@@ -20,10 +20,11 @@ int module_load_and_warn(struct kmod_ctx *ctx, const char *module, bool verbose)
                 return log_full_errno(verbose ? LOG_ERR : LOG_DEBUG, r,
                                       "Failed to look up module alias '%s': %m", module);
 
-        if (!modlist)
-                return log_full_errno(verbose ? LOG_ERR : LOG_DEBUG,
-                                      SYNTHETIC_ERRNO(ENOENT),
-                                      "Failed to find module '%s'", module);
+        if (!modlist) {
+                log_full_errno(verbose ? LOG_ERR : LOG_DEBUG, r,
+                               "Failed to find module '%s'", module);
+                return -ENOENT;
+        }
 
         kmod_list_foreach(itr, modlist) {
                 _cleanup_(kmod_module_unrefp) struct kmod_module *mod = NULL;

src/sleep/sleep.c

@@ -163,10 +163,10 @@ static int lock_all_homes(void) {
                 if (!bus_error_is_unknown_service(&error))
                         return log_error_errno(r, "Failed to lock home directories: %s", bus_error_message(&error, r));
 
-                log_debug("systemd-homed is not running, locking of home directories skipped.");
-        } else
-                log_debug("Successfully requested locking of all home directories.");
-        return 0;
+                return log_debug("systemd-homed is not running, locking of home directories skipped.");
+        }
+
+        return log_debug("Successfully requested locking of all home directories.");
 }
 
 static int execute(char **modes, char **states, const char *action) {

src/stdio-bridge/stdio-bridge.c

@@ -10,6 +10,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-internal.h"
 #include "bus-util.h"
 #include "errno-util.h"
@@ -17,7 +18,6 @@
 #include "log.h"
 #include "main-func.h"
 #include "util.h"
-#include "version.h"
 
 #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket"
 

src/test/test-bpf-foreign-programs.c

@@ -293,7 +293,7 @@ int main(int argc, char *argv[]) {
 
         r = cg_all_unified();
         if (r <= 0)
-                return log_tests_skipped("Unified hierarchy is required, skipping.");
+                return log_tests_skipped_errno(r, "Unified hierarchy is required, skipping.");
 
         r = enter_cgroup_subroot(NULL);
         if (r == -ENOMEDIUM)

src/test/test-cgroup-setup.c

@@ -3,13 +3,13 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "cgroup-setup.h"
 #include "errno-util.h"
 #include "log.h"
 #include "proc-cmdline.h"
 #include "string-util.h"
 #include "tests.h"
-#include "version.h"
 
 static void test_is_wanted_print(bool header) {
         _cleanup_free_ char *cmdline = NULL;

src/test/test-cgroup-util.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
+#include "build.h"
 #include "cgroup-util.h"
 #include "dirent-util.h"
 #include "errno-util.h"
@@ -16,7 +17,6 @@
 #include "tests.h"
 #include "user-util.h"
 #include "util.h"
-#include "version.h"
 
 static void check_p_d_u(const char *path, int code, const char *result) {
         _cleanup_free_ char *unit = NULL;

src/test/test-udev.c

@@ -11,6 +11,7 @@
 #include <sys/signalfd.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "device-private.h"
 #include "fs-util.h"
 #include "log.h"
@@ -23,7 +24,6 @@
 #include "string-util.h"
 #include "tests.h"
 #include "udev-event.h"
-#include "version.h"
 
 static int fake_filesystems(void) {
         static const struct fakefs {

src/udev/cdrom_id/cdrom_id.c

@@ -302,23 +302,10 @@ static int cd_capability_compat(Context *c) {
 }
 
 static int cd_media_compat(Context *c) {
-        int r;
-
         assert(c);
 
-        r = ioctl(c->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
-        if (r < 0)
-                return log_debug_errno(errno, "ioctl(CDROM_DRIVE_STATUS) failed: m");
-        if (r != CDS_DISC_OK) {
-                log_debug("ioctl(CDROM_DRIVE_STATUS) → %d (%s), ignoring",
-                          r,
-                          r == CDS_NO_INFO ? "no info" :
-                          r == CDS_NO_DISC ? "no disc" :
-                          r == CDS_TRAY_OPEN ? "tray open" :
-                          r == CDS_DRIVE_NOT_READY ? "drive not ready" :
-                          "unkown status");
-                return -ENOMEDIUM;
-        }
+        if (ioctl(c->fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) != CDS_DISC_OK)
+                return log_debug_errno(errno, "CDROM_DRIVE_STATUS != CDS_DISC_OK");
 
         c->has_media = true;
         return 0;
@@ -743,23 +730,25 @@ static int cd_media_toc(Context *c) {
 }
 
 static int open_drive(Context *c) {
-        int fd;
+        _cleanup_close_ int fd = -1;
 
         assert(c);
         assert(c->fd < 0);
 
-        for (int cnt = 0;; cnt++) {
-                fd = open(arg_node, O_RDONLY|O_NONBLOCK|O_CLOEXEC);
-                if (fd >= 0)
-                        break;
-                if (++cnt >= 20 || errno != EBUSY)
-                        return log_debug_errno(errno, "Unable to open '%s': %m", arg_node);
+        for (int cnt = 0; cnt < 20; cnt++) {
+                if (cnt != 0)
+                        (void) usleep(100 * USEC_PER_MSEC + random_u64() % (100 * USEC_PER_MSEC));
 
-                (void) usleep(100 * USEC_PER_MSEC + random_u64() % (100 * USEC_PER_MSEC));
+                fd = open(arg_node, O_RDONLY|O_NONBLOCK|O_CLOEXEC);
+                if (fd >= 0 || errno != EBUSY)
+                        break;
         }
+        if (fd < 0)
+                return log_debug_errno(errno, "Unable to open '%s'", arg_node);
 
         log_debug("probing: '%s'", arg_node);
-        c->fd = fd;
+
+        c->fd = TAKE_FD(fd);
         return 0;
 }
 
@@ -950,7 +939,7 @@ static int parse_argv(int argc, char *argv[]) {
 
         arg_node = argv[optind];
         if (!arg_node)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "No device specified.");
+                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "No device is specified.");
 
         return 1;
 }

src/udev/dmi_memory_id/dmi_memory_id.c

@@ -45,12 +45,12 @@
 #include <getopt.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "fileio.h"
 #include "main-func.h"
 #include "string-util.h"
 #include "udev-util.h"
 #include "unaligned.h"
-#include "version.h"
 
 #define SUPPORTED_SMBIOS_VER 0x030300
 

src/udev/net/link-config.c

@@ -364,11 +364,9 @@ static int get_mac(sd_device *device, MACAddressPolicy policy, struct ether_addr
                 return r;
         switch (addr_type) {
         case NET_ADDR_SET:
-                log_device_debug(device, "MAC on the device already set by userspace");
-                return 0;
+                return log_device_debug(device, "MAC on the device already set by userspace");
         case NET_ADDR_STOLEN:
-                log_device_debug(device, "MAC on the device already set based on another device");
-                return 0;
+                return log_device_debug(device, "MAC on the device already set based on another device");
         case NET_ADDR_RANDOM:
         case NET_ADDR_PERM:
                 break;
@@ -377,11 +375,9 @@ static int get_mac(sd_device *device, MACAddressPolicy policy, struct ether_addr
                 return 0;
         }
 
-        if (want_random == (addr_type == NET_ADDR_RANDOM)) {
-                log_device_debug(device, "MAC on the device already matches policy *%s*",
-                                 mac_address_policy_to_string(policy));
-                return 0;
-        }
+        if (want_random == (addr_type == NET_ADDR_RANDOM))
+                return log_device_debug(device, "MAC on the device already matches policy *%s*",
+                                        mac_address_policy_to_string(policy));
 
         if (want_random) {
                 log_device_debug(device, "Using random bytes to generate MAC");

src/udev/scsi_id/scsi_id.c

@@ -17,6 +17,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "device-nodes.h"
 #include "extract-word.h"
 #include "fd-util.h"
@@ -26,7 +27,6 @@
 #include "strv.h"
 #include "strxcpyx.h"
 #include "udev-util.h"
-#include "version.h"
 
 static const struct option options[] = {
         { "device",             required_argument, NULL, 'd' },

src/udev/udev-rules.c

@@ -184,30 +184,21 @@ struct UdevRules {
 
 /*** Logging helpers ***/
 
-#define log_rule_full_errno_zerook(device, rules, level, error, fmt, ...) \
+#define log_rule_full_errno(device, rules, level, error, fmt, ...)      \
         ({                                                              \
                 UdevRules *_r = (rules);                                \
                 UdevRuleFile *_f = _r ? _r->current_file : NULL;        \
                 UdevRuleLine *_l = _f ? _f->current_line : NULL;        \
                 const char *_n = _f ? _f->filename : NULL;              \
                                                                         \
-                log_device_full_errno_zerook(                           \
-                                device, level, error, "%s:%u " fmt,     \
-                                strna(_n), _l ? _l->line_number : 0,    \
-                                ##__VA_ARGS__);                         \
+                log_device_full_errno(device, level, error, "%s:%u " fmt, \
+                                      strna(_n), _l ? _l->line_number : 0, \
+                                      ##__VA_ARGS__);                   \
         })
 
-#define log_rule_full_errno(device, rules, level, error, fmt, ...)      \
-        ({                                                              \
-                int _error = (error);                                   \
-                ASSERT_NON_ZERO(_error);                                \
-                log_rule_full_errno_zerook(                             \
-                    device, rules, level, _error, fmt, ##__VA_ARGS__);  \
-        })
+#define log_rule_full(device, rules, level, ...)   (void) log_rule_full_errno(device, rules, level, 0, __VA_ARGS__)
 
-#define log_rule_full(device, rules, level, ...)   (void) log_rule_full_errno_zerook(device, rules, level, 0, __VA_ARGS__)
-
-#define log_rule_debug(device, rules, ...)   log_rule_full(device, rules, LOG_DEBUG, __VA_ARGS__)
+#define log_rule_debug(device, rules, ...)   log_rule_full_errno(device, rules, LOG_DEBUG, 0, __VA_ARGS__)
 #define log_rule_info(device, rules, ...)    log_rule_full(device, rules, LOG_INFO, __VA_ARGS__)
 #define log_rule_notice(device, rules, ...)  log_rule_full(device, rules, LOG_NOTICE, __VA_ARGS__)
 #define log_rule_warning(device, rules, ...) log_rule_full(device, rules, LOG_WARNING, __VA_ARGS__)
@@ -219,11 +210,10 @@ struct UdevRules {
 #define log_rule_warning_errno(device, rules, error, ...) log_rule_full_errno(device, rules, LOG_WARNING, error, __VA_ARGS__)
 #define log_rule_error_errno(device, rules, error, ...)   log_rule_full_errno(device, rules, LOG_ERR, error, __VA_ARGS__)
 
-#define log_token_full_errno_zerook(rules, level, error, ...) log_rule_full_errno_zerook(NULL, rules, level, error, __VA_ARGS__)
 #define log_token_full_errno(rules, level, error, ...) log_rule_full_errno(NULL, rules, level, error, __VA_ARGS__)
-#define log_token_full(rules, level, ...)  (void) log_token_full_errno_zerook(rules, level, 0, __VA_ARGS__)
+#define log_token_full(rules, level, ...)  (void) log_token_full_errno(rules, level, 0, __VA_ARGS__)
 
-#define log_token_debug(rules, ...)   log_token_full(rules, LOG_DEBUG, __VA_ARGS__)
+#define log_token_debug(rules, ...)   log_token_full_errno(rules, LOG_DEBUG, 0, __VA_ARGS__)
 #define log_token_info(rules, ...)    log_token_full(rules, LOG_INFO, __VA_ARGS__)
 #define log_token_notice(rules, ...)  log_token_full(rules, LOG_NOTICE, __VA_ARGS__)
 #define log_token_warning(rules, ...) log_token_full(rules, LOG_WARNING, __VA_ARGS__)
@@ -2133,11 +2123,7 @@ static int udev_rule_apply_token_to_event(
                 (void) udev_event_apply_format(event, token->value, value, sizeof(value), false);
 
                 log_rule_debug(dev, rules, "ATTR '%s' writing '%s'", buf, value);
-                r = write_string_file(buf, value,
-                                      WRITE_STRING_FILE_VERIFY_ON_FAILURE |
-                                      WRITE_STRING_FILE_DISABLE_BUFFER |
-                                      WRITE_STRING_FILE_AVOID_NEWLINE |
-                                      WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
+                r = write_string_file(buf, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_AVOID_NEWLINE);
                 if (r < 0)
                         log_rule_error_errno(dev, rules, r, "Failed to write ATTR{%s}, ignoring: %m", buf);
                 break;

src/udev/udevadm.h

@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 
+#include "build.h"
 #include "macro.h"
 
 int info_main(int argc, char *argv[], void *userdata);

src/udev/udevd.c

@@ -28,6 +28,7 @@
 #include "sd-event.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "cgroup-util.h"
 #include "cpu-set-util.h"
 #include "dev-setup.h"
@@ -64,7 +65,6 @@
 #include "udev-util.h"
 #include "udev-watch.h"
 #include "user-util.h"
-#include "version.h"
 
 #define WORKER_NUM_MAX 2048U