From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 12 Jan 2016 15:55:08 +0000 (-0500)
Subject: testutils: Fix coverity warning with REGENERATE_OUTPUT
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ebfd6f45c385bb04623479bab7a77beb3ffe167b;p=libvirt.git

testutils: Fix coverity warning with REGENERATE_OUTPUT

- Don't double check for expectName
- actual is always non-NULL by this point, so don't check it either
---

diff --git a/tests/testutils.c b/tests/testutils.c
index 4ffea0c4ad..b587f83b0f 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -469,15 +469,14 @@ virtTestDifferenceFullInternal(FILE *stream,
     actualStart = actual;
     actualEnd = actual + (strlen(actual)-1);
 
-    if (regenerate && (virTestGetRegenerate() > 0) && expectName && actual) {
+    if (expectName && regenerate && (virTestGetRegenerate() > 0)) {
         char *regencontent;
 
         /* Try to properly indent qemu argv files */
         if (!(regencontent = virStringReplace(actual, " -", " \\\n-")))
             return -1;
 
-        if (expectName && actual &&
-            virFileWriteStr(expectName, regencontent, 0666) < 0) {
+        if (virFileWriteStr(expectName, regencontent, 0666) < 0) {
             VIR_FREE(regencontent);
             return -1;
         }