From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 15 Apr 2021 09:22:22 +0000 (+0200)
Subject: Voidify log_{device,token,rule}_debug()
X-Git-Tag: v249-rc1~407^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d9fed9ef4567a779ac6f9ac153745ef3bc8882a;p=thirdparty%2Fsystemd.git

Voidify log_{device,token,rule}_debug()

See analogous change for log_debug() for discussion.
---

diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h
index 026bdcd644c..0585c57bc98 100644
--- a/src/libsystemd/sd-device/device-util.h
+++ b/src/libsystemd/sd-device/device-util.h
@@ -60,7 +60,7 @@
 
 #define log_device_full(device, level, ...) (void) log_device_full_errno(device, level, 0, __VA_ARGS__)
 
-#define log_device_debug(device, ...)   log_device_full_errno(device, LOG_DEBUG, 0, __VA_ARGS__)
+#define log_device_debug(device, ...)   log_device_full(device, LOG_DEBUG, __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__)
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 31e5d0cd673..87afe8383ad 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -364,9 +364,11 @@ static int get_mac(sd_device *device, MACAddressPolicy policy, struct ether_addr
                 return r;
         switch (addr_type) {
         case NET_ADDR_SET:
-                return log_device_debug(device, "MAC on the device already set by userspace");
+                log_device_debug(device, "MAC on the device already set by userspace");
+                return 0;
         case NET_ADDR_STOLEN:
-                return log_device_debug(device, "MAC on the device already set based on another device");
+                log_device_debug(device, "MAC on the device already set based on another device");
+                return 0;
         case NET_ADDR_RANDOM:
         case NET_ADDR_PERM:
                 break;
@@ -375,9 +377,11 @@ static int get_mac(sd_device *device, MACAddressPolicy policy, struct ether_addr
                 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 == (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) {
                 log_device_debug(device, "Using random bytes to generate MAC");
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 57ede6a197f..ee7404b9f6c 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -198,7 +198,7 @@ struct UdevRules {
 
 #define log_rule_full(device, rules, level, ...)   (void) log_rule_full_errno(device, rules, level, 0, __VA_ARGS__)
 
-#define log_rule_debug(device, rules, ...)   log_rule_full_errno(device, rules, LOG_DEBUG, 0, __VA_ARGS__)
+#define log_rule_debug(device, rules, ...)   log_rule_full(device, rules, LOG_DEBUG, __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__)
@@ -213,7 +213,7 @@ struct UdevRules {
 #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(rules, level, 0, __VA_ARGS__)
 
-#define log_token_debug(rules, ...)   log_token_full_errno(rules, LOG_DEBUG, 0, __VA_ARGS__)
+#define log_token_debug(rules, ...)   log_token_full(rules, LOG_DEBUG, __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__)