]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-netlink: do not require rtnl pointer to be passed
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 10 Jan 2020 15:32:27 +0000 (16:32 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 11 Jan 2020 11:07:28 +0000 (12:07 +0100)
src/libsystemd/sd-netlink/netlink-util.c

index c9d4e3c607906b7d95e4524cd7c15a8890a12e8a..0b2d171b2d29fbe88da53c6f4d3079a17a1b826d 100644 (file)
@@ -168,12 +168,14 @@ int rtnl_set_link_alternative_names_by_ifname(sd_netlink **rtnl, const char *ifn
 }
 
 int rtnl_resolve_link_alternative_name(sd_netlink **rtnl, const char *name) {
+        _cleanup_(sd_netlink_unrefp) sd_netlink *our_rtnl = NULL;
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *message = NULL, *reply = NULL;
         int r, ret;
 
-        assert(rtnl);
         assert(name);
 
+        if (!rtnl)
+                rtnl = &our_rtnl;
         if (!*rtnl) {
                 r = sd_netlink_open(rtnl);
                 if (r < 0)