From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 7 Oct 2024 03:39:27 +0000 (+0900)
Subject: network: use Network.name for bus path
X-Git-Tag: v257-rc1~308
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1faf2e5332633901dc52fb4baf07953f33b6a079;p=thirdparty%2Fsystemd.git

network: use Network.name for bus path

No functional change, just refactoring.
---

diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c
index 0c4032633fb..5c61cbf8873 100644
--- a/src/network/networkd-network-bus.c
+++ b/src/network/networkd-network-bus.c
@@ -55,30 +55,13 @@ static const sd_bus_vtable network_vtable[] = {
 };
 
 static char *network_bus_path(Network *network) {
-        _cleanup_free_ char *name = NULL, *networkname= NULL;
-        char *d, *path;
+        char *path;
         int r;
 
         assert(network);
-        assert(network->filename);
+        assert(network->name);
 
-        name = strdup(network->filename);
-        if (!name)
-                return NULL;
-
-        r = path_extract_filename(name, &networkname);
-        if (r < 0)
-                return NULL;
-
-        d = strrchr(networkname, '.');
-        if (!d)
-                return NULL;
-
-        assert(streq(d, ".network"));
-
-        *d = '\0';
-
-        r = sd_bus_path_encode("/org/freedesktop/network1/network", networkname, &path);
+        r = sd_bus_path_encode("/org/freedesktop/network1/network", network->name, &path);
         if (r < 0)
                 return NULL;