networkd: rename manager_connect_varlink() → manager_varlink_init()

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()

diff --git a/src/network/networkd-manager-varlink.c b/src/network/networkd-manager-varlink.c
index cc46e60e4055374f6f44bc774851544c77aafdc6..a83665b982d672020053afc48bf01d443434dd94 100644 (file)
--- 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 0933c2a0566b9d58aa355f5a5d2893333a0c1ebd..edbc76859fc7f255099cb55f835a914171aafd89 100644 (file)
--- 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 762f1ca190182a4740fba74171157914c461e501..fc0a435554196c66e676e322ad1e1ea2470ef461 100644 (file)
--- 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;