From: Ján Tomko Date: Wed, 31 Jan 2018 15:37:16 +0000 (+0100) Subject: vboxDumpSharedFolders: rename non-standard label X-Git-Tag: v4.2.0-rc1~302 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c93a41d6b88b932bcc55d0775cea516b1c368d1;p=thirdparty%2Flibvirt.git vboxDumpSharedFolders: rename non-standard label s/sharedFoldersCleanup/cleanup/ Signed-off-by: Ján Tomko --- diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 07f4308784..e1629b07f6 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3640,10 +3640,10 @@ vboxDumpSharedFolders(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine gVBoxAPI.UArray.handleMachineGetSharedFolders(machine)); if (sharedFolders.count <= 0) - goto sharedFoldersCleanup; + goto cleanup; if (VIR_ALLOC_N(def->fss, sharedFolders.count) < 0) - goto sharedFoldersCleanup; + goto cleanup; for (i = 0; i < sharedFolders.count; i++) { ISharedFolder *sharedFolder = sharedFolders.items[i]; @@ -3654,7 +3654,7 @@ vboxDumpSharedFolders(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine PRBool writable = PR_FALSE; if (VIR_ALLOC(def->fss[i]) < 0) - goto sharedFoldersCleanup; + goto cleanup; def->fss[i]->type = VIR_DOMAIN_FS_TYPE_MOUNT; @@ -3663,7 +3663,7 @@ vboxDumpSharedFolders(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine if (VIR_STRDUP(def->fss[i]->src->path, hostPath) < 0) { VBOX_UTF8_FREE(hostPath); VBOX_UTF16_FREE(hostPathUtf16); - goto sharedFoldersCleanup; + goto cleanup; } VBOX_UTF8_FREE(hostPath); VBOX_UTF16_FREE(hostPathUtf16); @@ -3673,7 +3673,7 @@ vboxDumpSharedFolders(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine if (VIR_STRDUP(def->fss[i]->dst, name) < 0) { VBOX_UTF8_FREE(name); VBOX_UTF16_FREE(nameUtf16); - goto sharedFoldersCleanup; + goto cleanup; } VBOX_UTF8_FREE(name); VBOX_UTF16_FREE(nameUtf16); @@ -3684,7 +3684,7 @@ vboxDumpSharedFolders(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine ++def->nfss; } - sharedFoldersCleanup: + cleanup: gVBoxAPI.UArray.vboxArrayRelease(&sharedFolders); }