rpc: virnetserver: virNetServerAddService() to void

virNetServerAddService() return value is invariant, so change it
type and remove all dependent checks.

Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 48f5c73fce4aa7901b03eeef8f574fa8ed2f1457..0a92a24fb76ad2a52f554855165e8690dd8aa580 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -947,8 +947,7 @@ static int virLXCControllerSetupServer(virLXCController *ctrl)
     if (virSecurityManagerClearSocketLabel(ctrl->securityManager, ctrl->def) < 0)
         goto error;
 
-    if (virNetServerAddService(srv, svc) < 0)
-        goto error;
+    virNetServerAddService(srv, svc);
     g_clear_pointer(&svc, virObjectUnref);
 
     if (!(ctrl->prog = virNetServerProgramNew(VIR_LXC_MONITOR_PROGRAM,

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 770476c1a6ee7c88733624f28bc843e19bdf8d65..a6c6443c5590b5a5cc4f16b1d20db90414ab8f3c 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -513,10 +513,7 @@ virNetServerNewPostExecRestart(virJSONValue *object,
         if (!(service = virNetServerServiceNewPostExecRestart(child)))
             return NULL;
 
-        if (virNetServerAddService(srv, service) < 0) {
-            virObjectUnref(service);
-            return NULL;
-        }
+        virNetServerAddService(srv, service);
     }
 
 
@@ -623,7 +620,7 @@ virNetServerPreExecRestart(virNetServer *srv)
 }
 
 
-int
+void
 virNetServerAddService(virNetServer *srv,
                        virNetServerService *svc)
 {
@@ -633,7 +630,6 @@ virNetServerAddService(virNetServer *srv,
     srv->services[srv->nservices-1] = virObjectRef(svc);
 
     virNetServerServiceSetDispatcher(svc, virNetServerDispatchNewClient, srv);
-    return 0;
 }
 
 
@@ -669,10 +665,7 @@ virNetServerAddServiceActivation(virNetServer *srv,
         if (!svc)
             return -1;
 
-        if (virNetServerAddService(srv, svc) < 0) {
-            virObjectUnref(svc);
-            return -1;
-        }
+        virNetServerAddService(srv, svc);
     }
 
     /* Intentionally return 1 any time activation is present,
@@ -723,11 +716,7 @@ virNetServerAddServiceTCP(virNetServer *srv,
                                           nrequests_client_max)))
         return -1;
 
-    if (virNetServerAddService(srv, svc) < 0) {
-        virObjectUnref(svc);
-        return -1;
-    }
-
+    virNetServerAddService(srv, svc);
     virObjectUnref(svc);
 
     return 0;
@@ -772,11 +761,7 @@ virNetServerAddServiceUNIX(virNetServer *srv,
                                            nrequests_client_max)))
         return -1;
 
-    if (virNetServerAddService(srv, svc) < 0) {
-        virObjectUnref(svc);
-        return -1;
-    }
-
+    virNetServerAddService(srv, svc);
     virObjectUnref(svc);
 
     return 0;

diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h
index 9f0cf3a3fcc313af890f5646d977133b8b89b426..7756a1dd6cadfa4ddbff0915bd623f13c6335dc1 100644 (file)
--- a/src/rpc/virnetserver.h
+++ b/src/rpc/virnetserver.h
@@ -59,8 +59,8 @@ void virNetServerShutdownWait(virNetServer *srv);
 
 virJSONValue *virNetServerPreExecRestart(virNetServer *srv);
 
-int virNetServerAddService(virNetServer *srv,
-                           virNetServerService *svc);
+void virNetServerAddService(virNetServer *srv,
+                            virNetServerService *svc);
 int virNetServerAddServiceTCP(virNetServer *srv,
                               virSystemdActivation *act,
                               const char *actname,

diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index 110ec748f8b661c3eeedb097cd70116af2eae062..74c20479d458f352aa7c57cde2d12f86e2619fbe 100644 (file)
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -127,10 +127,8 @@ testCreateServer(const char *server_name, const char *host, int family)
                                            5)))
         goto error;
 
-    if (virNetServerAddService(srv, svc1) < 0)
-        goto error;
-    if (virNetServerAddService(srv, svc2) < 0)
-        goto error;
+    virNetServerAddService(srv, svc1);
+    virNetServerAddService(srv, svc2);
 
     if (virNetSocketNewConnectSockFD(fdclient[0], &sk1) < 0)
         goto error;