From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 22 Nov 2019 22:52:35 +0000 (-0800)
Subject: Code clean up in lib/file/filePosix.c
X-Git-Tag: stable-11.1.0~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76d11da84f4bbb9889effee1269a70a454c0f9bc;p=thirdparty%2Fopen-vm-tools.git

Code clean up in lib/file/filePosix.c

Consolidate identical code in File_GetCapacity() and File_GetFreeSpace().
---

diff --git a/open-vm-tools/lib/file/filePosix.c b/open-vm-tools/lib/file/filePosix.c
index 31e344087..d6b7f7704 100644
--- a/open-vm-tools/lib/file/filePosix.c
+++ b/open-vm-tools/lib/file/filePosix.c
@@ -992,7 +992,7 @@ File_SetFilePermissions(const char *pathName,  // IN:
  *-----------------------------------------------------------------------------
  */
 
-static Bool
+Bool
 FilePosixGetParent(char **canPath)  // IN/OUT: Canonical file path
 {
    char *pathName;
@@ -1049,6 +1049,7 @@ File_GetParent(char **canPath)  // IN/OUT: Canonical file path
 }
 
 
+#if !defined(__APPLE__) || TARGET_OS_IPHONE
 /*
  *----------------------------------------------------------------------
  *
@@ -1140,6 +1141,7 @@ File_GetFreeSpace(const char *pathName,  // IN: File name
 
    return ret;
 }
+#endif
 
 
 #if defined(VMX86_SERVER)
@@ -1622,25 +1624,7 @@ File_SupportsOptimisticLock(const char *pathName)  // IN:
 uint64
 File_GetCapacity(const char *pathName)  // IN: Path name
 {
-   uint64 ret;
-   char *fullPath;
-   struct statfs statfsbuf;
-
-   fullPath = File_FullPath(pathName);
-   if (fullPath == NULL) {
-      return -1;
-   }
-
-   if (FileGetStats(fullPath, FALSE, &statfsbuf)) {
-      ret = (uint64) statfsbuf.f_blocks * statfsbuf.f_bsize;
-   } else {
-      Warning(LGPFX" %s: Couldn't statfs\n", __func__);
-      ret = -1;
-   }
-
-   Posix_Free(fullPath);
-
-   return ret;
+   return File_GetFreeSpace(pathName, FALSE);
 }