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

tests: storage: Refactor cleanup in testBackingParse

Browse Source 
Automatically clean the temporary buffer and get rid of the cleanup
label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-08-15 19:16:21 +02:00
parent aece36f767
commit ffabad7572
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/virstoragetest.c
View File

@ -609,28 +609,27 @@ static int
testBackingParse(const void *args) testBackingParse(const void *args)
{ {
const struct testBackingParseData *data = args; const struct testBackingParseData *data = args;
virBuffer buf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;
int ret = -1;
VIR_AUTOFREE(char *) xml = NULL; VIR_AUTOFREE(char *) xml = NULL;
VIR_AUTOUNREF(virStorageSourcePtr) src = NULL; VIR_AUTOUNREF(virStorageSourcePtr) src = NULL;
if (!(src = virStorageSourceNewFromBackingAbsolute(data->backing))) { if (!(src = virStorageSourceNewFromBackingAbsolute(data->backing))) {
if (!data->expect) if (!data->expect)
ret = 0; return 0;
else
goto cleanup; return -1;
} }
if (src && !data->expect) { if (src && !data->expect) {
fprintf(stderr, "parsing of backing store string '%s' should " fprintf(stderr, "parsing of backing store string '%s' should "
"have failed\n", data->backing); "have failed\n", data->backing);
goto cleanup; return -1;
} }
if (virDomainDiskSourceFormat(&buf, src, "source", 0, false, 0, NULL) < 0 || if (virDomainDiskSourceFormat(&buf, src, "source", 0, false, 0, NULL) < 0 ||
!(xml = virBufferContentAndReset(&buf))) { !(xml = virBufferContentAndReset(&buf))) {
fprintf(stderr, "failed to format disk source xml\n"); fprintf(stderr, "failed to format disk source xml\n");
goto cleanup; return -1;
} }
if (STRNEQ(xml, data->expect)) { if (STRNEQ(xml, data->expect)) {
@ -638,15 +637,10 @@ testBackingParse(const void *args)
"expected storage source xml:\n%s\n" "expected storage source xml:\n%s\n"
"actual storage source xml:\n%s\n", "actual storage source xml:\n%s\n",
data->backing, data->expect, xml); data->backing, data->expect, xml);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
virBufferFreeAndReset(&buf);
return ret;
} }