summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorJán Tomko <jtomko@redhat.com>2019-10-18 13:27:03 +0200
committerJán Tomko <jtomko@redhat.com>2019-10-21 12:51:55 +0200
commit64023f6d215c10dfadd4887ac7b28aab33ec4089 (patch)
tree6968d2dd94f25c797454be43ef7effd372554e86 /src/test
parentd74067c07be3cdd655a87ceaafdb3005396f7676 (diff)
downloadlibvirt-64023f6d215c10dfadd4887ac7b28aab33ec4089.tar.gz
Use g_strdup instead of ignoring VIR_STRDUP's value
Replace all the occurrences of ignore_value(VIR_STRDUP(a, b)); with a = g_strdup(b); Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_driver.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index ab7e5fc02a..bd095604c7 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -725,7 +725,7 @@ static char *testBuildFilename(const char *relativeTo,
if (!filename || filename[0] == '\0')
return NULL;
if (filename[0] == '/') {
- ignore_value(VIR_STRDUP(ret, filename));
+ ret = g_strdup(filename);
return ret;
}
@@ -742,7 +742,7 @@ static char *testBuildFilename(const char *relativeTo,
strcat(absFile, filename);
return absFile;
} else {
- ignore_value(VIR_STRDUP(ret, filename));
+ ret = g_strdup(filename);
return ret;
}
}
@@ -1585,7 +1585,7 @@ testConnectGetSysinfo(virConnectPtr conn G_GNUC_UNUSED,
virCheckFlags(0, NULL);
- ignore_value(VIR_STRDUP(ret, sysinfo));
+ ret = g_strdup(sysinfo);
return ret;
}
@@ -2561,7 +2561,7 @@ testDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED)
{
char *ret;
- ignore_value(VIR_STRDUP(ret, "linux"));
+ ret = g_strdup("linux");
return ret;
}
@@ -4889,7 +4889,7 @@ static char *testDomainGetSchedulerType(virDomainPtr domain G_GNUC_UNUSED,
if (nparams)
*nparams = 1;
- ignore_value(VIR_STRDUP(type, "fair"));
+ type = g_strdup("fair");
return type;
}
@@ -5611,7 +5611,7 @@ testNetworkGetBridgeName(virNetworkPtr net)
goto cleanup;
}
- ignore_value(VIR_STRDUP(bridge, def->bridge));
+ bridge = g_strdup(def->bridge);
cleanup:
virNetworkObjEndAPI(&obj);
@@ -6367,7 +6367,7 @@ testConnectFindStoragePoolSources(virConnectPtr conn G_GNUC_UNUSED,
switch (pool_type) {
case VIR_STORAGE_POOL_LOGICAL:
- ignore_value(VIR_STRDUP(ret, defaultPoolSourcesLogicalXML));
+ ret = g_strdup(defaultPoolSourcesLogicalXML);
return ret;
case VIR_STORAGE_POOL_NETFS:
@@ -7241,7 +7241,7 @@ testStorageVolGetPath(virStorageVolPtr vol)
if (!(privvol = testStorageVolDefFindByName(obj, vol->name)))
goto cleanup;
- ignore_value(VIR_STRDUP(ret, privvol->target.path));
+ ret = g_strdup(privvol->target.path);
cleanup:
virStoragePoolObjEndAPI(&obj);
@@ -7362,7 +7362,7 @@ testNodeDeviceGetParent(virNodeDevicePtr dev)
def = virNodeDeviceObjGetDef(obj);
if (def->parent) {
- ignore_value(VIR_STRDUP(ret, def->parent));
+ ret = g_strdup(def->parent);
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("no parent for this device"));