From: Eric Blake <eblake@redhat.com>
Date: Wed, 2 Nov 2011 17:53:33 +0000 (-0600)
Subject: test: drop redundant check
X-Git-Tag: v0.9.7~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d897fc671063b3038e32ec1eab6ae32a3642b2b;p=thirdparty%2Flibvirt.git

test: drop redundant check

libvirt.c guarantees that nparams is non-zero for scheduler parameters.

* src/test/test_driver.c (testDomainGetSchedulerParamsFlags): Drop
redundant check.  Avoid strcpy.
---

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 4e1973adb6..3dbce18376 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2709,11 +2709,12 @@ testDomainGetSchedulerParamsFlags(virDomainPtr domain,
         goto cleanup;
     }
 
-    if (*nparams < 1) {
-        testError(VIR_ERR_INVALID_ARG, "%s", _("Invalid parameter count"));
+    if (virStrcpyStatic(params[0].field,
+                        VIR_DOMAIN_SCHEDULER_WEIGHT) == NULL) {
+        testError(VIR_ERR_INTERNAL_ERROR, _("Field name '%s' too long"),
+                  VIR_DOMAIN_SCHEDULER_WEIGHT);
         goto cleanup;
     }
-    strcpy(params[0].field, VIR_DOMAIN_SCHEDULER_WEIGHT);
     params[0].type = VIR_TYPED_PARAM_UINT;
     /* XXX */
     /*params[0].value.ui = privdom->weight;*/