From 5615ac1f0d5aa3a0623433e57a072f0eb9bb8ded Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 13 Oct 2025 12:35:35 +0200 Subject: [PATCH] =?utf8?q?networkd:=20rename=20manager=5Fconnect=5Fvarlink?= =?utf8?q?()=20=E2=86=92=20manager=5Fvarlink=5Finit()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This function doesn't "connect" to Varlink (i.e. it isn't a client) but it binds a Varlink socket (i.e. it is server), hence let's remove the verb "connect" from its name. let's copy how machined/resolved name the counterpart for this function: manager_varlink_init() --- src/network/networkd-manager-varlink.c | 4 ++-- src/network/networkd-manager-varlink.h | 2 +- src/network/networkd-manager.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/network/networkd-manager-varlink.c b/src/network/networkd-manager-varlink.c index cc46e60e405..a83665b982d 100644 --- a/src/network/networkd-manager-varlink.c +++ b/src/network/networkd-manager-varlink.c @@ -279,9 +279,9 @@ static int vl_method_set_persistent_storage(sd_varlink *vlink, sd_json_variant * return sd_varlink_reply(vlink, NULL); } -int manager_connect_varlink(Manager *m, int fd) { +int manager_varlink_init(Manager *m, int fd) { _cleanup_(sd_varlink_server_unrefp) sd_varlink_server *s = NULL; - _unused_ _cleanup_close_ int fd_close = fd; + _unused_ _cleanup_close_ int fd_close = fd; /* take possession */ int r; assert(m); diff --git a/src/network/networkd-manager-varlink.h b/src/network/networkd-manager-varlink.h index 0933c2a0566..edbc76859fc 100644 --- a/src/network/networkd-manager-varlink.h +++ b/src/network/networkd-manager-varlink.h @@ -3,4 +3,4 @@ #include "networkd-forward.h" -int manager_connect_varlink(Manager *m, int fd); +int manager_varlink_init(Manager *m, int fd); diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 762f1ca1901..fc0a4355541 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -595,7 +595,7 @@ int manager_setup(Manager *m) { if (m->test_mode) return 0; - r = manager_connect_varlink(m, TAKE_FD(varlink_fd)); + r = manager_varlink_init(m, TAKE_FD(varlink_fd)); if (r < 0) return r; -- 2.47.3