NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virStorageFileChainLookup: Return virStorageSourcePtr

Browse Source 
Returning both virStorageSourcePtr and its path member does not make a
lot of sense.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark
2014-04-18 15:25:19 +02:00
parent f33eb9c115
commit f5869657c8
4 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/virstoragetest.c
View File

@@ -424,16 +424,11 @@ testStorageLookup(const void *args)
{
const struct testLookupData *data = args;
int ret = 0;
const char *actualResult;
virStorageSourcePtr actualMeta;
virStorageSourcePtr result;
const char *actualParent;
/* This function is documented as giving results within chain, but
* as the same string may be duplicated into more than one field,
* we rely on STREQ rather than pointer equality. Test twice to
* ensure optional parameters don't cause NULL deref. */
actualResult = virStorageFileChainLookup(data->chain, data->name,
NULL, NULL);
/* Test twice to ensure optional parameter doesn't cause NULL deref. */
result = virStorageFileChainLookup(data->chain, data->name, NULL);
if (!data->expResult) {
if (!virGetLastError()) {
@@ -448,24 +443,36 @@ testStorageLookup(const void *args)
}
}
if (STRNEQ_NULLABLE(data->expResult, actualResult)) {
if (!result) {
if (data->expResult) {
fprintf(stderr, "result 1: expected %s, got NULL\n",
data->expResult);
ret = -1;
}
} else if (STRNEQ_NULLABLE(data->expResult, result->path)) {
fprintf(stderr, "result 1: expected %s, got %s\n",
NULLSTR(data->expResult), NULLSTR(actualResult));
NULLSTR(data->expResult), NULLSTR(result->path));
ret = -1;
}
actualResult = virStorageFileChainLookup(data->chain, data->name,
&actualMeta, &actualParent);
result = virStorageFileChainLookup(data->chain, data->name, &actualParent);
if (!data->expResult)
virResetLastError();
if (STRNEQ_NULLABLE(data->expResult, actualResult)) {
if (!result) {
if (data->expResult) {
fprintf(stderr, "result 2: expected %s, got NULL\n",
data->expResult);
ret = -1;
}
} else if (STRNEQ_NULLABLE(data->expResult, result->path)) {
fprintf(stderr, "result 2: expected %s, got %s\n",
NULLSTR(data->expResult), NULLSTR(actualResult));
NULLSTR(data->expResult), NULLSTR(result->path));
ret = -1;
}
if (data->expMeta != actualMeta) {
if (data->expMeta != result) {
fprintf(stderr, "meta: expected %p, got %p\n",
data->expMeta, actualMeta);
data->expMeta, result);
ret = -1;
}
if (STRNEQ_NULLABLE(data->expParent, actualParent)) {