tests: Use g_strdup_printf() instead of virAsprintf()

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Michal Privoznik
2019-10-22 15:26:14 +02:00
parent 06030f05bb
commit 4fa804c0c7
87 changed files with 483 additions and 859 deletions

View File

@@ -79,13 +79,12 @@ testQemuCaps(const void *opaque)
unsigned int fakeMicrocodeVersion = 0;
const char *p;
if (virAsprintf(&repliesFile, "%s/%s_%s.%s.%s",
data->inputDir, data->prefix, data->version,
data->archName, data->suffix) < 0 ||
virAsprintf(&capsFile, "%s/%s_%s.%s.xml",
data->outputDir, data->prefix, data->version,
data->archName) < 0)
goto cleanup;
repliesFile = g_strdup_printf("%s/%s_%s.%s.%s",
data->inputDir, data->prefix, data->version,
data->archName, data->suffix);
capsFile = g_strdup_printf("%s/%s_%s.%s.xml",
data->outputDir, data->prefix, data->version,
data->archName);
if (!(mon = qemuMonitorTestNewFromFileFull(repliesFile, &data->driver, NULL,
NULL)))
@@ -150,10 +149,9 @@ testQemuCapsCopy(const void *opaque)
virQEMUCapsPtr copy = NULL;
char *actual = NULL;
if (virAsprintf(&capsFile, "%s/%s_%s.%s.xml",
data->outputDir, data->prefix, data->version,
data->archName) < 0)
goto cleanup;
capsFile = g_strdup_printf("%s/%s_%s.%s.xml",
data->outputDir, data->prefix, data->version,
data->archName);
if (!(caps = virCapabilitiesNew(virArchFromString(data->archName),
false, false)))
@@ -195,10 +193,8 @@ doCapsTest(const char *inputDir,
g_autofree char *title = NULL;
g_autofree char *copyTitle = NULL;
if (virAsprintf(&title, "%s (%s)", version, archName) < 0 ||
virAsprintf(&copyTitle, "copy %s (%s)", version, archName) < 0) {
return -1;
}
title = g_strdup_printf("%s (%s)", version, archName);
copyTitle = g_strdup_printf("copy %s (%s)", version, archName);
data->inputDir = inputDir;
data->prefix = prefix;