External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmware: Use g_strdup_printf() instead of virAsprintf()

Browse Source 
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 24d213b03c
commit adca67448e
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/vmware/vmware_conf.c
View File

@ -275,18 +275,15 @@ vmwareExtractVersion(struct vmware_driver *driver)
switch (driver->type) { switch (driver->type) {
case VMWARE_DRIVER_PLAYER: case VMWARE_DRIVER_PLAYER:
if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer") < 0) bin = g_strdup_printf("%s/%s", vmwarePath, "vmplayer");
goto cleanup;
break; break;
case VMWARE_DRIVER_WORKSTATION: case VMWARE_DRIVER_WORKSTATION:
if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware") < 0) bin = g_strdup_printf("%s/%s", vmwarePath, "vmware");
goto cleanup;
break; break;
case VMWARE_DRIVER_FUSION: case VMWARE_DRIVER_FUSION:
if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx") < 0) bin = g_strdup_printf("%s/%s", vmwarePath, "vmware-vmx");
goto cleanup;
break; break;
default: default:
@ -365,19 +362,13 @@ vmwareParsePath(const char *path, char **directory, char **filename)
return -1; return -1;
} }
int void
vmwareConstructVmxPath(char *directoryName, char *name, char **vmxPath) vmwareConstructVmxPath(char *directoryName, char *name, char **vmxPath)
{ {
int ret;
if (directoryName != NULL) if (directoryName != NULL)
ret = virAsprintf(vmxPath, "%s/%s.vmx", directoryName, name); *vmxPath = g_strdup_printf("%s/%s.vmx", directoryName, name);
else else
ret = virAsprintf(vmxPath, "%s.vmx", name); *vmxPath = g_strdup_printf("%s.vmx", name);
if (ret < 0)
return -1;
return 0;
} }
int int
@ -437,8 +428,7 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath)
goto cleanup; goto cleanup;
} }
if (vmwareConstructVmxPath(directoryName, vmdef->name, vmxPath) < 0) vmwareConstructVmxPath(directoryName, vmdef->name, vmxPath);
goto cleanup;
ret = 0; ret = 0;
@ -477,8 +467,7 @@ vmwareMoveFile(char *srcFile, char *dstFile)
int int
vmwareMakePath(char *srcDir, char *srcName, char *srcExt, char **outpath) vmwareMakePath(char *srcDir, char *srcName, char *srcExt, char **outpath)
{ {
if (virAsprintf(outpath, "%s/%s.%s", srcDir, srcName, srcExt) < 0) *outpath = g_strdup_printf("%s/%s.%s", srcDir, srcName, srcExt);
return -1;
return 0; return 0;
} }
@ -495,9 +484,7 @@ vmwareExtractPid(const char * vmxPath)
if ((vmxDir = mdir_name(vmxPath)) == NULL) if ((vmxDir = mdir_name(vmxPath)) == NULL)
goto cleanup; goto cleanup;
if (virAsprintf(&logFilePath, "%s/vmware.log", logFilePath = g_strdup_printf("%s/vmware.log", vmxDir);
vmxDir) < 0)
goto cleanup;
if ((logFile = fopen(logFilePath, "r")) == NULL) if ((logFile = fopen(logFilePath, "r")) == NULL)
goto cleanup; goto cleanup;

4
src/vmware/vmware_conf.h
View File

@ -71,8 +71,8 @@ int vmwareParseVersionStr(int type, const char *buf, unsigned long *version);
int vmwareDomainConfigDisplay(vmwareDomainPtr domain, virDomainDefPtr vmdef); int vmwareDomainConfigDisplay(vmwareDomainPtr domain, virDomainDefPtr vmdef);
int vmwareConstructVmxPath(char *directoryName, char *name, void vmwareConstructVmxPath(char *directoryName, char *name,
char **vmxPath); char **vmxPath);
int vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath); int vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath);