From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 14 Apr 2021 20:19:58 +0000 (+0200)
Subject: Voidify log_link_debug
X-Git-Tag: v249-rc1~407^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e89f6ed476ba488bc4aff3d428725baee4d5e5e6;p=thirdparty%2Fsystemd.git

Voidify log_link_debug

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

diff --git a/src/network/networkd-mdb.c b/src/network/networkd-mdb.c
index f5aff722488..b3d583e6e62 100644
--- a/src/network/networkd-mdb.c
+++ b/src/network/networkd-mdb.c
@@ -208,8 +208,10 @@ int link_set_bridge_mdb(Link *link) {
         if (hashmap_isempty(link->network->mdb_entries_by_section))
                 goto finish;
 
-        if (!link_has_carrier(link))
-                return log_link_debug(link, "Link does not have carrier yet, setting MDB entries later.");
+        if (!link_has_carrier(link)) {
+                log_link_debug(link, "Link does not have carrier yet, setting MDB entries later.");
+                return 0;
+        }
 
         if (link->network->bridge) {
                 Link *master;
@@ -218,8 +220,10 @@ 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))
-                        return log_link_debug(link, "Bridge interface %s does not have carrier yet, setting MDB entries later.", 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;
+                }
 
         } else if (!streq_ptr(link->kind, "bridge")) {
                 log_link_warning(link, "Link is neither a bridge master nor a bridge port, ignoring [BridgeMDB] sections.");
diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c
index 470095c8974..c32cc70798b 100644
--- a/src/network/networkd-nexthop.c
+++ b/src/network/networkd-nexthop.c
@@ -711,8 +711,10 @@ 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))
-                return log_link_debug(link, "rtnl: received nexthop message with invalid family %d, ignoring.", tmp->family);
+        } 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;
+        }
 
         r = sd_rtnl_message_nexthop_get_protocol(message, &tmp->protocol);
         if (r < 0) {
diff --git a/src/shared/log-link.h b/src/shared/log-link.h
index 3a4dcaa267b..ecc2609e51e 100644
--- a/src/shared/log-link.h
+++ b/src/shared/log-link.h
@@ -29,7 +29,7 @@
 
 #define log_link_full(link, level, ...) (void) log_link_full_errno(link, level, 0, __VA_ARGS__)
 
-#define log_link_debug(link, ...)   log_link_full_errno(link, LOG_DEBUG, 0, __VA_ARGS__)
+#define log_link_debug(link, ...)   log_link_full(link, LOG_DEBUG, __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__)