From: VMware, Inc <>
Date: Tue, 29 Mar 2011 20:24:23 +0000 (-0700)
Subject: lib/file: minor cleanup
X-Git-Tag: 2011.03.28-387002~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7166193957df9f300c7ca0ce256d4285df5466cb;p=thirdparty%2Fopen-vm-tools.git

lib/file: minor cleanup

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/file/file.c b/open-vm-tools/lib/file/file.c
index 89d7b5d41..d6f10c6e3 100644
--- a/open-vm-tools/lib/file/file.c
+++ b/open-vm-tools/lib/file/file.c
@@ -1014,9 +1014,8 @@ File_GetPathName(ConstUnicode fullPath,  // IN:
     */
 
    if (!Unicode_IsEmpty(volume)) {
-      Unicode temp;
+      Unicode temp = Unicode_Append(volume, *pathName);
 
-      temp = Unicode_Append(volume, *pathName);
       Unicode_Free(*pathName);
       *pathName = temp;
    }
@@ -1036,9 +1035,8 @@ File_GetPathName(ConstUnicode fullPath,  // IN:
    }
 
    if (curLen < len) {
-      Unicode temp;
+      Unicode temp = Unicode_Substr(*pathName, 0, curLen);
 
-      temp = Unicode_Substr(*pathName, 0, curLen);
       Unicode_Free(*pathName);
       *pathName = temp;
    }