util: virtypedparam: Remove return values from virTypedParamListAdd* APIs

The function now return always 0. Refactor the code and remove return
values.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

1 files changed, 28 insertions, 80 deletions

diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c
index 1d1ae97f2f..2498a1309a 100644
--- a/src/admin/admin_server.c
+++ b/src/admin/admin_server.c
@@ -89,29 +89,12 @@ adminServerGetThreadPoolParameters(virNetServer *srv,
         return -1;
     }
 
-    if (virTypedParamListAddUInt(paramlist, minWorkers,
-                                 "%s", VIR_THREADPOOL_WORKERS_MIN) < 0)
-        return -1;
-
-    if (virTypedParamListAddUInt(paramlist, maxWorkers,
-                                 "%s", VIR_THREADPOOL_WORKERS_MAX) < 0)
-        return -1;
-
-    if (virTypedParamListAddUInt(paramlist, nWorkers,
-                                 "%s", VIR_THREADPOOL_WORKERS_CURRENT) < 0)
-        return -1;
-
-    if (virTypedParamListAddUInt(paramlist, freeWorkers,
-                                 "%s", VIR_THREADPOOL_WORKERS_FREE) < 0)
-        return -1;
-
-    if (virTypedParamListAddUInt(paramlist, nPrioWorkers,
-                                 "%s", VIR_THREADPOOL_WORKERS_PRIORITY) < 0)
-        return -1;
-
-    if (virTypedParamListAddUInt(paramlist, jobQueueDepth,
-                                 "%s", VIR_THREADPOOL_JOB_QUEUE_DEPTH) < 0)
-        return -1;
+    virTypedParamListAddUInt(paramlist, minWorkers, VIR_THREADPOOL_WORKERS_MIN);
+    virTypedParamListAddUInt(paramlist, maxWorkers, VIR_THREADPOOL_WORKERS_MAX);
+    virTypedParamListAddUInt(paramlist, nWorkers, VIR_THREADPOOL_WORKERS_CURRENT);
+    virTypedParamListAddUInt(paramlist, freeWorkers, VIR_THREADPOOL_WORKERS_FREE);
+    virTypedParamListAddUInt(paramlist, nPrioWorkers, VIR_THREADPOOL_WORKERS_PRIORITY);
+    virTypedParamListAddUInt(paramlist, jobQueueDepth, VIR_THREADPOOL_JOB_QUEUE_DEPTH);
 
     if (virTypedParamListSteal(paramlist, params, nparams) < 0)
         return -1;
@@ -211,74 +194,54 @@ adminClientGetInfo(virNetServerClient *client,
                                   &sock_addr, &identity) < 0)
         return -1;
 
-    if (virTypedParamListAddBoolean(paramlist, readonly,
-                                    "%s", VIR_CLIENT_INFO_READONLY) < 0)
-        return -1;
+    virTypedParamListAddBoolean(paramlist, readonly, VIR_CLIENT_INFO_READONLY);
 
     if ((rc = virIdentityGetSASLUserName(identity, &attr)) < 0)
         return -1;
-    if (rc == 1 &&
-        virTypedParamListAddString(paramlist, attr,
-                                   "%s", VIR_CLIENT_INFO_SASL_USER_NAME) < 0)
-        return -1;
+    if (rc == 1)
+        virTypedParamListAddString(paramlist, attr, VIR_CLIENT_INFO_SASL_USER_NAME);
 
     if (!virNetServerClientIsLocal(client)) {
-        if (virTypedParamListAddString(paramlist, sock_addr,
-                                       "%s", VIR_CLIENT_INFO_SOCKET_ADDR) < 0)
-            return -1;
+        virTypedParamListAddString(paramlist, sock_addr, VIR_CLIENT_INFO_SOCKET_ADDR);
 
         if ((rc = virIdentityGetX509DName(identity, &attr)) < 0)
             return -1;
-        if (rc == 1 &&
-            virTypedParamListAddString(paramlist, attr,
-                                       "%s", VIR_CLIENT_INFO_X509_DISTINGUISHED_NAME) < 0)
-            return -1;
+        if (rc == 1)
+            virTypedParamListAddString(paramlist, attr, VIR_CLIENT_INFO_X509_DISTINGUISHED_NAME);
     } else {
         pid_t pid;
         uid_t uid;
         gid_t gid;
         if ((rc = virIdentityGetUNIXUserID(identity, &uid)) < 0)
             return -1;
-        if (rc == 1 &&
-            virTypedParamListAddInt(paramlist, uid,
-                                    "%s", VIR_CLIENT_INFO_UNIX_USER_ID) < 0)
-            return -1;
+        if (rc == 1)
+            virTypedParamListAddInt(paramlist, uid, VIR_CLIENT_INFO_UNIX_USER_ID);
 
         if ((rc = virIdentityGetUserName(identity, &attr)) < 0)
             return -1;
-        if (rc == 1 &&
-            virTypedParamListAddString(paramlist, attr,
-                                       "%s", VIR_CLIENT_INFO_UNIX_USER_NAME) < 0)
-            return -1;
+        if (rc == 1)
+            virTypedParamListAddString(paramlist, attr, VIR_CLIENT_INFO_UNIX_USER_NAME);
 
         if ((rc = virIdentityGetUNIXGroupID(identity, &gid)) < 0)
             return -1;
-        if (rc == 1 &&
-            virTypedParamListAddInt(paramlist, gid,
-                                    "%s", VIR_CLIENT_INFO_UNIX_GROUP_ID) < 0)
-            return -1;
+        if (rc == 1)
+            virTypedParamListAddInt(paramlist, gid, VIR_CLIENT_INFO_UNIX_GROUP_ID);
 
         if ((rc = virIdentityGetGroupName(identity, &attr)) < 0)
             return -1;
-        if (rc == 1 &&
-            virTypedParamListAddString(paramlist, attr,
-                                       "%s", VIR_CLIENT_INFO_UNIX_GROUP_NAME) < 0)
-            return -1;
+        if (rc == 1)
+            virTypedParamListAddString(paramlist, attr, VIR_CLIENT_INFO_UNIX_GROUP_NAME);
 
         if ((rc = virIdentityGetProcessID(identity, &pid)) < 0)
             return -1;
-        if (rc == 1 &&
-            virTypedParamListAddInt(paramlist, pid,
-                                    "%s", VIR_CLIENT_INFO_UNIX_PROCESS_ID) < 0)
-            return -1;
+        if (rc == 1)
+            virTypedParamListAddInt(paramlist, pid, VIR_CLIENT_INFO_UNIX_PROCESS_ID);
     }
 
     if ((rc = virIdentityGetSELinuxContext(identity, &attr)) < 0)
         return -1;
-    if (rc == 1 &&
-        virTypedParamListAddString(paramlist, attr,
-                                   "%s", VIR_CLIENT_INFO_SELINUX_CONTEXT) < 0)
-        return -1;
+    if (rc == 1)
+        virTypedParamListAddString(paramlist, attr, VIR_CLIENT_INFO_SELINUX_CONTEXT);
 
     if (virTypedParamListSteal(paramlist, params, nparams) < 0)
         return -1;
@@ -305,25 +268,10 @@ adminServerGetClientLimits(virNetServer *srv,
 
     virCheckFlags(0, -1);
 
-    if (virTypedParamListAddUInt(paramlist,
-                                 virNetServerGetMaxClients(srv),
-                                 "%s", VIR_SERVER_CLIENTS_MAX) < 0)
-        return -1;
-
-    if (virTypedParamListAddUInt(paramlist,
-                                 virNetServerGetCurrentClients(srv),
-                                 "%s", VIR_SERVER_CLIENTS_CURRENT) < 0)
-        return -1;
-
-    if (virTypedParamListAddUInt(paramlist,
-                                 virNetServerGetMaxUnauthClients(srv),
-                                 "%s", VIR_SERVER_CLIENTS_UNAUTH_MAX) < 0)
-        return -1;
-
-    if (virTypedParamListAddUInt(paramlist,
-                                 virNetServerGetCurrentUnauthClients(srv),
-                                 "%s", VIR_SERVER_CLIENTS_UNAUTH_CURRENT) < 0)
-        return -1;
+    virTypedParamListAddUInt(paramlist, virNetServerGetMaxClients(srv), VIR_SERVER_CLIENTS_MAX);
+    virTypedParamListAddUInt(paramlist, virNetServerGetCurrentClients(srv), VIR_SERVER_CLIENTS_CURRENT);
+    virTypedParamListAddUInt(paramlist, virNetServerGetMaxUnauthClients(srv), VIR_SERVER_CLIENTS_UNAUTH_MAX);
+    virTypedParamListAddUInt(paramlist, virNetServerGetCurrentUnauthClients(srv), VIR_SERVER_CLIENTS_UNAUTH_CURRENT);
 
     if (virTypedParamListSteal(paramlist, params, nparams) < 0)
         return -1;