From 1faf2e5332633901dc52fb4baf07953f33b6a079 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 7 Oct 2024 12:39:27 +0900 Subject: [PATCH] network: use Network.name for bus path No functional change, just refactoring. --- src/network/networkd-network-bus.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) 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; -- 2.47.3