From e6ab10098066dd04794ff2ee5d10bc9b1db93327 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 3 May 2013 14:50:46 +0200
Subject: [PATCH] Adapt to VIR_STRDUP and VIR_STRNDUP in src/vmware/*

---
 src/vmware/vmware_conf.c   | 28 ++++++++++------------------
 src/vmware/vmware_driver.c | 11 +++++------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 4fb61a8a5a..4b61a9cad0 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -174,11 +174,8 @@ vmwareLoadDomains(struct vmware_driver *driver)
 
         pDomain = vm->privateData;
 
-        pDomain->vmxPath = strdup(vmxPath);
-        if (pDomain->vmxPath == NULL) {
-            virReportOOMError();
+        if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0)
             goto cleanup;
-        }
 
         vmwareDomainConfigDisplay(pDomain, vmdef);
 
@@ -297,22 +294,21 @@ vmwareParsePath(char *path, char **directory, char **filename)
             return -1;
         }
 
-        if ((*directory = strdup(path)) == NULL)
-            goto no_memory;
-        if ((*filename = strdup(separator)) == NULL) {
+        if (VIR_STRDUP(*directory, path) < 0)
+            goto error;
+        if (VIR_STRDUP(*filename, separator) < 0) {
             VIR_FREE(*directory);
-            goto no_memory;
+            goto error;
         }
 
     } else {
-        if ((*filename = strdup(path)) == NULL)
-            goto no_memory;
+        if (VIR_STRDUP(*filename, path) < 0)
+            goto error;
     }
 
     return 0;
 
-no_memory:
-    virReportOOMError();
+error:
     return -1;
 }
 
@@ -492,12 +488,8 @@ cleanup:
 char *
 vmwareCopyVMXFileName(const char *datastorePath, void *opaque ATTRIBUTE_UNUSED)
 {
-    char *path = strdup(datastorePath);
-
-    if (path == NULL) {
-        virReportOOMError();
-        return NULL;
-    }
+    char *path;
 
+    ignore_value(VIR_STRDUP_QUIET(path, datastorePath));
     return path;
 }
diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 1e2634eb91..91a271f046 100644
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -33,6 +33,7 @@
 #include "vmx.h"
 #include "vmware_conf.h"
 #include "vmware_driver.h"
+#include "virstring.h"
 
 static const char *vmw_types[] = { "player", "ws" };
 
@@ -352,10 +353,8 @@ vmwareDomainDefineXML(virConnectPtr conn, const char *xml)
         goto cleanup;
 
     pDomain = vm->privateData;
-    if ((pDomain->vmxPath = strdup(vmxPath)) == NULL) {
-        virReportOOMError();
+    if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0)
         goto cleanup;
-    }
 
     vmwareDomainConfigDisplay(pDomain, vmdef);
 
@@ -636,7 +635,8 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *xml,
         goto cleanup;
 
     pDomain = vm->privateData;
-    pDomain->vmxPath = strdup(vmxPath);
+    if (VIR_STRDUP(pDomain->vmxPath, vmxPath) < 0)
+        goto cleanup;
 
     vmwareDomainConfigDisplay(pDomain, vmdef);
     vmdef = NULL;
@@ -800,8 +800,7 @@ vmwareDomainGetOSType(virDomainPtr dom)
         goto cleanup;
     }
 
-    if (!(ret = strdup(vm->def->os.type)))
-        virReportOOMError();
+    ignore_value(VIR_STRDUP(ret, vm->def->os.type));
 
   cleanup:
     if (vm)
-- 
GitLab