[libvirt] [PATCH 62/75] vmware: Use g_strdup_printf() instead of virAsprintf()

Michal Privoznik mprivozn at redhat.com
Tue Oct 22 13:58:06 UTC 2019


Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/vmware/vmware_conf.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 1e836ec7ed..ef7696a496 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -275,15 +275,15 @@ vmwareExtractVersion(struct vmware_driver *driver)
 
     switch (driver->type) {
         case VMWARE_DRIVER_PLAYER:
-            virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer");
+            bin = g_strdup_printf("%s/%s", vmwarePath, "vmplayer");
             break;
 
         case VMWARE_DRIVER_WORKSTATION:
-            virAsprintf(&bin, "%s/%s", vmwarePath, "vmware");
+            bin = g_strdup_printf("%s/%s", vmwarePath, "vmware");
             break;
 
         case VMWARE_DRIVER_FUSION:
-            virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx");
+            bin = g_strdup_printf("%s/%s", vmwarePath, "vmware-vmx");
             break;
 
         default:
@@ -366,9 +366,9 @@ void
 vmwareConstructVmxPath(char *directoryName, char *name, char **vmxPath)
 {
     if (directoryName != NULL)
-        virAsprintf(vmxPath, "%s/%s.vmx", directoryName, name);
+        *vmxPath = g_strdup_printf("%s/%s.vmx", directoryName, name);
     else
-        virAsprintf(vmxPath, "%s.vmx", name);
+        *vmxPath = g_strdup_printf("%s.vmx", name);
 }
 
 int
@@ -467,7 +467,7 @@ vmwareMoveFile(char *srcFile, char *dstFile)
 int
 vmwareMakePath(char *srcDir, char *srcName, char *srcExt, char **outpath)
 {
-    virAsprintf(outpath, "%s/%s.%s", srcDir, srcName, srcExt);
+    *outpath = g_strdup_printf("%s/%s.%s", srcDir, srcName, srcExt);
     return 0;
 }
 
@@ -484,7 +484,7 @@ vmwareExtractPid(const char * vmxPath)
     if ((vmxDir = mdir_name(vmxPath)) == NULL)
         goto cleanup;
 
-    virAsprintf(&logFilePath, "%s/vmware.log", vmxDir);
+    logFilePath = g_strdup_printf("%s/vmware.log", vmxDir);
 
     if ((logFile = fopen(logFilePath, "r")) == NULL)
         goto cleanup;
-- 
2.21.0




More information about the libvir-list mailing list