libvirtd: rename virNetServerClient callback impls to match type names

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 48bdc27a5f687c1806301e7a701d8e6575716599..c5bb12b8ce088ee3ae545609d668ecbc317f6d3a 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1311,9 +1311,9 @@ int main(int argc, char **argv) {
                                 config->keepalive_interval,
                                 config->keepalive_count,
                                 config->mdns_adv ? config->mdns_name : NULL,
-                                remoteClientInitHook,
+                                remoteClientNew,
                                 NULL,
-                                remoteClientFreeFunc,
+                                remoteClientFree,
                                 NULL))) {
         ret = VIR_DAEMON_ERR_INIT;
         goto cleanup;
@@ -1385,9 +1385,9 @@ int main(int argc, char **argv) {
                                    config->admin_keepalive_interval,
                                    config->admin_keepalive_count,
                                    NULL,
-                                   remoteAdmClientInitHook,
+                                   remoteAdmClientNew,
                                    NULL,
-                                   remoteAdmClientFreeFunc,
+                                   remoteAdmClientFree,
                                    dmn))) {
         ret = VIR_DAEMON_ERR_INIT;
         goto cleanup;

diff --git a/daemon/remote.c b/daemon/remote.c
index b6fe6d8539ff8a02fcda989b760bfeb9de84e2db..6de4bd00d4e517e5feb898f88719ac1efbf5bc2b 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1734,7 +1734,7 @@ remoteClientFreePrivateCallbacks(struct daemonClientPrivate *priv)
  * We keep the libvirt connection open until any async
  * jobs have finished, then clean it up elsewhere
  */
-void remoteClientFreeFunc(void *data)
+void remoteClientFree(void *data)
 {
     struct daemonClientPrivate *priv = data;
 
@@ -1757,8 +1757,8 @@ static void remoteClientCloseFunc(virNetServerClientPtr client)
 }
 
 
-void *remoteClientInitHook(virNetServerClientPtr client,
-                           void *opaque ATTRIBUTE_UNUSED)
+void *remoteClientNew(virNetServerClientPtr client,
+                      void *opaque ATTRIBUTE_UNUSED)
 {
     struct daemonClientPrivate *priv;
 

diff --git a/daemon/remote.h b/daemon/remote.h
index d42a19e92e9ac53fbc77f5dff328c32dfc3c1b57..c1bce9ba2e46728cff97a4ff47f74b0ab15ff595 100644 (file)
--- a/daemon/remote.h
+++ b/daemon/remote.h
@@ -38,8 +38,8 @@ extern size_t lxcNProcs;
 extern virNetServerProgramProc qemuProcs[];
 extern size_t qemuNProcs;
 
-void remoteClientFreeFunc(void *data);
-void *remoteClientInitHook(virNetServerClientPtr client,
-                           void *opaque);
+void remoteClientFree(void *data);
+void *remoteClientNew(virNetServerClientPtr client,
+                      void *opaque);
 
 #endif /* __LIBVIRTD_REMOTE_H__ */

diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c
index 068358b049b774ff2439e1cf62066981f4ce9fe3..9f110025a2c99ad5faa0c5c67a40a6c0450a9fad 100644 (file)
--- a/src/admin/admin_server_dispatch.c
+++ b/src/admin/admin_server_dispatch.c
@@ -52,7 +52,7 @@ struct daemonAdmClientPrivate {
 };
 
 void
-remoteAdmClientFreeFunc(void *data)
+remoteAdmClientFree(void *data)
 {
     struct daemonAdmClientPrivate *priv = data;
 
@@ -62,8 +62,8 @@ remoteAdmClientFreeFunc(void *data)
 }
 
 void *
-remoteAdmClientInitHook(virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                        void *opaque)
+remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                   void *opaque)
 {
     struct daemonAdmClientPrivate *priv;
 

diff --git a/src/admin/admin_server_dispatch.h b/src/admin/admin_server_dispatch.h
index 01723e5c436a4cd6c22075b3920107507a22c983..ff6cfcd6076b7aff0dc1c746daeb25a8b14498b1 100644 (file)
--- a/src/admin/admin_server_dispatch.h
+++ b/src/admin/admin_server_dispatch.h
@@ -31,7 +31,7 @@
 extern virNetServerProgramProc adminProcs[];
 extern size_t adminNProcs;
 
-void remoteAdmClientFreeFunc(void *data);
-void *remoteAdmClientInitHook(virNetServerClientPtr client, void *opaque);
+void remoteAdmClientFree(void *data);
+void *remoteAdmClientNew(virNetServerClientPtr client, void *opaque);
 
 #endif /* __ADMIN_SERVER_DISPATCH_H__ */