From: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Date: Thu, 8 Mar 2018 12:20:33 +0000 (+0100)
Subject: test: rename defaultConn to defaultPrivconn
X-Git-Tag: v4.2.0-rc1~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55130c0b63617489ca2585ac5e1f3e3501f87436;p=thirdparty%2Flibvirt.git

test: rename defaultConn to defaultPrivconn

Rename the variable @defaultConn to @defaultPrivconn as it doesn't
point to a default connection but to the private data used for the
shared default connection of the test driver.

Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index d5e0db38ab..58878b349a 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -125,7 +125,7 @@ struct _testDriver {
 typedef struct _testDriver testDriver;
 typedef testDriver *testDriverPtr;
 
-static testDriverPtr defaultConn;
+static testDriverPtr defaultPrivconn;
 static int defaultConnections;
 static virMutex defaultLock = VIR_MUTEX_INITIALIZER;
 
@@ -1305,7 +1305,7 @@ testOpenDefault(virConnectPtr conn)
 
     virMutexLock(&defaultLock);
     if (defaultConnections++) {
-        conn->privateData = defaultConn;
+        conn->privateData = defaultPrivconn;
         virMutexUnlock(&defaultLock);
         return VIR_DRV_OPEN_SUCCESS;
     }
@@ -1345,7 +1345,7 @@ testOpenDefault(virConnectPtr conn)
     if (testOpenParse(privconn, NULL, ctxt) < 0)
         goto error;
 
-    defaultConn = privconn;
+    defaultPrivconn = privconn;
     ret = VIR_DRV_OPEN_SUCCESS;
  cleanup:
     virMutexUnlock(&defaultLock);
@@ -1468,7 +1468,7 @@ static int testConnectClose(virConnectPtr conn)
     testDriverPtr privconn = conn->privateData;
     bool dflt = false;
 
-    if (privconn == defaultConn) {
+    if (privconn == defaultPrivconn) {
         dflt = true;
         virMutexLock(&defaultLock);
         if (--defaultConnections) {
@@ -1482,7 +1482,7 @@ static int testConnectClose(virConnectPtr conn)
     testDriverFree(privconn);
 
     if (dflt) {
-        defaultConn = NULL;
+        defaultPrivconn = NULL;
         virMutexUnlock(&defaultLock);
     }