Re: [libvirt] [PATCH 02/19] test: Use consistent variable names for storage test driver APIs

A virStoragePoolObjPtr will be an 'obj'. A virStoragePoolPtr will be a 'pool'. Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/test/test_driver.c | 443 ++++++++++++++++++++++++------------------------- 1 file changed, 219 insertions(+), 224 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 548f318..c0e46af 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c

@@ -4057,18 +4056,18 @@ testStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { testDriverPtr privconn = conn->privateData; - virStoragePoolObjPtr pool; + virStoragePoolObjPtr obj; virStoragePoolPtr ret = NULL;

- if (!(pool = testStoragePoolObjFindByUUID(privconn, uuid))) + if (!(obj = testStoragePoolObjFindByUUID(privconn, uuid))) goto cleanup; - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + ret = virGetStoragePool(conn, obj->def->name, obj->def->uuid, NULL, NULL); cleanup: - if (pool) - virStoragePoolObjUnlock(pool); + if (obj) + virStoragePoolObjUnlock(obj); return ret; } @@ -4078,18 +4077,18 @@ testStoragePoolLookupByName(virConnectPtr conn, const char *name) { testDriverPtr privconn = conn->privateData; - virStoragePoolObjPtr pool; + virStoragePoolObjPtr obj; virStoragePoolPtr ret = NULL;

- if (!(pool = testStoragePoolObjFindByName(privconn, name))) + if (!(obj = testStoragePoolObjFindByName(privconn, name))) goto cleanup; - ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid, + ret = virGetStoragePool(conn, obj->def->name, obj->def->uuid, NULL, NULL); cleanup: - if (pool) - virStoragePoolObjUnlock(pool); + if (obj) + virStoragePoolObjUnlock(obj); return ret; }

@@ -4345,7 +4344,7 @@ testStoragePoolCreateXML(virConnectPtr conn, { testDriverPtr privconn = conn->privateData; virStoragePoolDefPtr def; - virStoragePoolObjPtr pool = NULL; + virStoragePoolObjPtr obj = NULL; virStoragePoolPtr ret = NULL;

virObjectEventPtr event = NULL;

@@ -4419,7 +4418,7 @@ testStoragePoolDefineXML(virConnectPtr conn, { testDriverPtr privconn = conn->privateData; virStoragePoolDefPtr def; - virStoragePoolObjPtr pool = NULL; + virStoragePoolObjPtr obj = NULL; virStoragePoolPtr ret = NULL;

virObjectEventPtr event = NULL;