On Tue, May 09, 2017 at 11:30:09AM -0400, John Ferlan wrote:
A virStoragePoolObjPtr will be an 'obj'.
A virStoragePoolPtr will be a 'pool'.
Signed-off-by: John Ferlan <jferlan@redhat.com> --- 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;
There you didn't changed the "ret" to "pool".
- 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;
Same here.
- 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;
And here.
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;
And here
virObjectEventPtr event = NULL;
[...] I don't like these type of patches. The value to noise ration is poor. I'm hesitating to give this patch an ACK even though I probably done that in the past. Pavel