From bfdbae06941d784a2135db15b40fccdcc393f288 Mon Sep 17 00:00:00 2001
From: Alex Jia <ajia@redhat.com>
Date: Tue, 31 Jan 2012 11:20:40 +0800
Subject: [PATCH] simplify block of codes

Using new function 'virTypedParameterArrayClear' to simplify block of codes.

* daemon/remote.c, src/remote/remote_driver.c: simplify codes.

Signed-off-by: Alex Jia <ajia@redhat.com>
---
 daemon/remote.c            |  6 +-----
 src/remote/remote_driver.c | 19 +++++--------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/daemon/remote.c b/daemon/remote.c
index cb8423a33e..e7d9b2fd9f 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -848,11 +848,7 @@ remoteDeserializeTypedParameters(remote_typed_param *args_params_val,
 
 cleanup:
     if (rv < 0) {
-        int j;
-        for (j = 0; j < i; ++j) {
-            if (params[j].type == VIR_TYPED_PARAM_STRING)
-                VIR_FREE(params[j].value.s);
-        }
+        virTypedParameterArrayClear(params, i);
         VIR_FREE(params);
     }
     return params;
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 61b96e9a43..031becda67 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -46,6 +46,7 @@
 #include "virfile.h"
 #include "command.h"
 #include "intprops.h"
+#include "virtypedparam.h"
 
 #define VIR_FROM_THIS VIR_FROM_REMOTE
 
@@ -1417,12 +1418,8 @@ remoteDeserializeTypedParameters(remote_typed_param *ret_params_val,
     rv = 0;
 
 cleanup:
-    if (rv < 0) {
-        int j;
-        for (j = 0; j < i; j++)
-            if (params[j].type == VIR_TYPED_PARAM_STRING)
-                VIR_FREE(params[j].value.s);
-    }
+    if (rv < 0)
+        virTypedParameterArrayClear(params, i);
     return rv;
 }
 
@@ -2384,15 +2381,9 @@ static int remoteDomainGetCPUStats(virDomainPtr domain,
 
     rv = ret.nparams;
 cleanup:
-    if (rv < 0) {
-        int max = nparams * ncpus;
-        int i;
+    if (rv < 0)
+        virTypedParameterArrayClear(params, nparams * ncpus);
 
-        for (i = 0; i < max; i++) {
-            if (params[i].type == VIR_TYPED_PARAM_STRING)
-                VIR_FREE(params[i].value.s);
-        }
-    }
     xdr_free ((xdrproc_t) xdr_remote_domain_get_cpu_stats_ret,
               (char *) &ret);
 done:
-- 
GitLab