diff options
| author | Michal Privoznik <mprivozn@redhat.com> | 2019-10-22 15:26:14 +0200 |
|---|---|---|
| committer | Michal Privoznik <mprivozn@redhat.com> | 2019-11-12 16:15:59 +0100 |
| commit | 4fa804c0c72c4786715a22f491c55a18780ca863 (patch) | |
| tree | 4eb5670b1ae0973431411183642dc59b81de41b3 /tests/vmx2xmltest.c | |
| parent | 06030f05bbdc1eb8d836829e256a3657f9aee1ee (diff) | |
| download | libvirt-4fa804c0c72c4786715a22f491c55a18780ca863.tar.gz | |
tests: Use g_strdup_printf() instead of virAsprintf()
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Diffstat (limited to 'tests/vmx2xmltest.c')
| -rw-r--r-- | tests/vmx2xmltest.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 706fec7bac..ad7b3360c3 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -114,16 +114,13 @@ testCompareHelper(const void *data) char *vmx = NULL; char *xml = NULL; - if (virAsprintf(&vmx, "%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, - info->input) < 0 || - virAsprintf(&xml, "%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, - info->output) < 0) { - goto cleanup; - } + vmx = g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, + info->input); + xml = g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, + info->output); ret = testCompareFiles(vmx, xml); - cleanup: VIR_FREE(vmx); VIR_FREE(xml); @@ -151,9 +148,7 @@ testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) goto cleanup; } - if (virAsprintf(&src, "[%s] %s", datastoreName, - directoryAndFileName) < 0) - goto cleanup; + src = g_strdup_printf("[%s] %s", datastoreName, directoryAndFileName); } else if (STRPREFIX(fileName, "/")) { /* Found absolute path referencing a file outside a datastore */ src = g_strdup(fileName); @@ -162,8 +157,7 @@ testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) src = NULL; } else { /* Found single file name referencing a file inside a datastore */ - if (virAsprintf(&src, "[datastore] directory/%s", fileName) < 0) - goto cleanup; + src = g_strdup_printf("[datastore] directory/%s", fileName); } cleanup: |