From: VMware, Inc <>
Date: Mon, 20 Sep 2010 18:08:42 +0000 (-0700)
Subject: lib/file: dump EXTERN from header file
X-Git-Tag: 2010.09.19-301124~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84cb383de0658e27f3597379c83e77d3b275ccfd;p=thirdparty%2Fopen-vm-tools.git

lib/file: dump EXTERN from header file

It's unnecessary.

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

diff --git a/open-vm-tools/lib/include/file.h b/open-vm-tools/lib/include/file.h
index e07b750f0..af8aefa87 100644
--- a/open-vm-tools/lib/include/file.h
+++ b/open-vm-tools/lib/include/file.h
@@ -92,190 +92,195 @@ typedef enum {
    FILEMACOS_UNMOUNT_ERROR,
 } FileMacosUnmountStatus;
 
-EXTERN FileMacosUnmountStatus FileMacos_UnmountDev(char const *bsdDev,
-                                                   Bool wholeDev,
-                                                   Bool eject,
-                                                   Bool su);
-
-EXTERN void FileMacos_MountDevAsyncNoResult(char const *bsdDev,
+FileMacosUnmountStatus FileMacos_UnmountDev(char const *bsdDev,
+                                            Bool wholeDev,
+                                            Bool eject,
                                             Bool su);
 
-EXTERN Bool FileMacos_IsOnExternalDevice(int fd);
-EXTERN Bool FileMacos_IsOnSparseDmg(int fd);
-EXTERN Bool FileMacos_IsSliceDevice(char const *bsdDev);
+void FileMacos_MountDevAsyncNoResult(char const *bsdDev,
+                                     Bool su);
+
+Bool FileMacos_IsOnExternalDevice(int fd);
+Bool FileMacos_IsOnSparseDmg(int fd);
+Bool FileMacos_IsSliceDevice(char const *bsdDev);
+
+char *FileMacos_DiskDevToUserFriendlyName(char const *bsdDiskDev);
 
-EXTERN char *FileMacos_DiskDevToUserFriendlyName(char const *bsdDiskDev);
+char *FileMacos_DiskDeviceToUniqueID(char const *bsdPath);
+char *FileMacos_UniqueIDToDiskDevice(char const *identifier);
 
-EXTERN char *FileMacos_DiskDeviceToUniqueID(char const *bsdPath);
-EXTERN char *FileMacos_UniqueIDToDiskDevice(char const *identifier);
 #elif defined VMX86_SERVER
-EXTERN int File_GetVMFSBlockSize(ConstUnicode pathName, uint32 *blockSize);
-EXTERN int File_GetVMFSMountInfo(ConstUnicode pathName,
-                                 char **fsType,
-                                 uint32 *version,
-                                 char **remoteIP,
-                                 char **remoteMountPoint,
-                                 char **localMountPoint);
+int File_GetVMFSBlockSize(ConstUnicode pathName,
+                          uint32 *blockSize);
+
+int File_GetVMFSMountInfo(ConstUnicode pathName,
+                          char **fsType,
+                          uint32 *version,
+                          char **remoteIP,
+                          char **remoteMountPoint,
+                          char **localMountPoint);
 #endif
 
-EXTERN Bool File_SupportsZeroedThick(ConstUnicode pathName);
+Bool File_SupportsZeroedThick(ConstUnicode pathName);
 
-EXTERN Bool File_SupportsMultiWriter(ConstUnicode pathName);
+Bool File_SupportsMultiWriter(ConstUnicode pathName);
 
-EXTERN Bool File_Exists(ConstUnicode pathName);
+Bool File_Exists(ConstUnicode pathName);
 
-EXTERN int File_Unlink(ConstUnicode pathName);
+int File_Unlink(ConstUnicode pathName);
 
-EXTERN int File_UnlinkIfExists(ConstUnicode pathName);
+int File_UnlinkIfExists(ConstUnicode pathName);
 
-EXTERN int File_UnlinkDelayed(ConstUnicode pathName);
+int File_UnlinkDelayed(ConstUnicode pathName);
 
-EXTERN int File_UnlinkNoFollow(ConstUnicode pathName);
+int File_UnlinkNoFollow(ConstUnicode pathName);
 
-EXTERN void File_SplitName(ConstUnicode pathName,
-                           Unicode *volume, 
-                           Unicode *dir, 
-                           Unicode *base);
+void File_SplitName(ConstUnicode pathName,
+                    Unicode *volume, 
+                    Unicode *dir, 
+                    Unicode *base);
 
-EXTERN void File_GetPathName(ConstUnicode fullPath, 
-                             Unicode *pathName, 
-                             Unicode *base);
+void File_GetPathName(ConstUnicode fullPath, 
+                      Unicode *pathName, 
+                      Unicode *base);
 
-EXTERN Unicode File_StripSlashes(ConstUnicode path);
+Unicode File_StripSlashes(ConstUnicode path);
 
-EXTERN Unicode File_PathJoin(ConstUnicode dirName,
-                             ConstUnicode baseName);
+Unicode File_PathJoin(ConstUnicode dirName,
+                      ConstUnicode baseName);
 
-EXTERN Bool File_CreateDirectory(ConstUnicode pathName);
-EXTERN Bool File_EnsureDirectory(ConstUnicode pathName);
+Bool File_CreateDirectory(ConstUnicode pathName);
+Bool File_EnsureDirectory(ConstUnicode pathName);
 
-EXTERN Bool File_DeleteEmptyDirectory(ConstUnicode pathName);
+Bool File_DeleteEmptyDirectory(ConstUnicode pathName);
 
-EXTERN Bool File_CreateDirectoryHierarchy(ConstUnicode pathName);
+Bool File_CreateDirectoryHierarchy(ConstUnicode pathName);
 
-EXTERN Bool File_DeleteDirectoryTree(ConstUnicode pathName);
+Bool File_DeleteDirectoryTree(ConstUnicode pathName);
 
-EXTERN int File_ListDirectory(ConstUnicode pathName,
-                              Unicode **ids);
+int File_ListDirectory(ConstUnicode pathName,
+                       Unicode **ids);
 
 /*
  * Simple file-system walk.
  */
 
-EXTERN WalkDirContext File_WalkDirectoryStart(ConstUnicode parentPath);
-EXTERN Bool File_WalkDirectoryNext(WalkDirContext context,
-                                   Unicode *path);
-EXTERN void File_WalkDirectoryEnd(WalkDirContext context);
+WalkDirContext File_WalkDirectoryStart(ConstUnicode parentPath);
+
+Bool File_WalkDirectoryNext(WalkDirContext context,
+                            Unicode *path);
+
+void File_WalkDirectoryEnd(WalkDirContext context);
 
-EXTERN Bool File_IsDirectory(ConstUnicode pathName);
+Bool File_IsDirectory(ConstUnicode pathName);
 
-EXTERN Bool File_IsFile(ConstUnicode pathName);
+Bool File_IsFile(ConstUnicode pathName);
 
-EXTERN Bool File_IsSymLink(ConstUnicode fileName);
+Bool File_IsSymLink(ConstUnicode fileName);
 
-EXTERN Bool File_IsCharDevice(ConstUnicode pathName);
+Bool File_IsCharDevice(ConstUnicode pathName);
 
-EXTERN Bool File_IsRemote(ConstUnicode pathName);
+Bool File_IsRemote(ConstUnicode pathName);
 
-EXTERN Bool File_IsEmptyDirectory(ConstUnicode pathName);
+Bool File_IsEmptyDirectory(ConstUnicode pathName);
 
-EXTERN Unicode File_Cwd(ConstUnicode drive); // XXX belongs to `process' module
+Unicode File_Cwd(ConstUnicode drive); // XXX belongs to `process' module
 
-EXTERN Unicode File_FullPath(ConstUnicode pathName);
+Unicode File_FullPath(ConstUnicode pathName);
 
-EXTERN Bool File_IsFullPath(ConstUnicode pathName);
+Bool File_IsFullPath(ConstUnicode pathName);
 
-EXTERN uint64 File_GetFreeSpace(ConstUnicode pathName,
-                                Bool doNotAscend);
+uint64 File_GetFreeSpace(ConstUnicode pathName,
+                         Bool doNotAscend);
 
-EXTERN uint64 File_GetCapacity(ConstUnicode pathName);
+uint64 File_GetCapacity(ConstUnicode pathName);
 
 /* Deprecated; use Util_GetSafeTmpDir if you can */
-EXTERN char *File_GetTmpDir(Bool useConf);
+char *File_GetTmpDir(Bool useConf);
 
 /* Deprecated; use Util_MakeSafeTemp if you can */
-EXTERN int File_MakeTemp(ConstUnicode tag,
-                         Unicode *presult);
+int File_MakeTemp(ConstUnicode tag,
+                  Unicode *presult);
 
-EXTERN int File_MakeTempEx(ConstUnicode dir,
-                           ConstUnicode fileName,
-                           Unicode *presult);
+int File_MakeTempEx(ConstUnicode dir,
+                    ConstUnicode fileName,
+                    Unicode *presult);
 
-EXTERN int File_MakeTempEx2(ConstUnicode dir,
-                            Bool createTempFile,
-                            File_MakeTempCreateNameFunc *createNameFunc,
-                            void *createFuncData,
-                            Unicode *presult);
+int File_MakeTempEx2(ConstUnicode dir,
+                     Bool createTempFile,
+                     File_MakeTempCreateNameFunc *createNameFunc,
+                     void *createFuncData,
+                     Unicode *presult);
 
-EXTERN int64 File_GetModTime(ConstUnicode pathName);
+int64 File_GetModTime(ConstUnicode pathName);
 
-EXTERN char *File_GetModTimeString(ConstUnicode pathName);
+char *File_GetModTimeString(ConstUnicode pathName);
 
-EXTERN char *File_GetUniqueFileSystemID(const char *fileName);
+char *File_GetUniqueFileSystemID(const char *fileName);
 
-EXTERN Bool File_GetTimes(ConstUnicode pathName,
-                          VmTimeType *createTime,
-                          VmTimeType *accessTime,
-                          VmTimeType *writeTime,
-                          VmTimeType *attrChangeTime);
+Bool File_GetTimes(ConstUnicode pathName,
+                   VmTimeType *createTime,
+                   VmTimeType *accessTime,
+                   VmTimeType *writeTime,
+                   VmTimeType *attrChangeTime);
 
-EXTERN Bool File_SetTimes(ConstUnicode pathName,
-                          VmTimeType createTime,
-                          VmTimeType accessTime,
-                          VmTimeType writeTime,
-                          VmTimeType attrChangeTime);
+Bool File_SetTimes(ConstUnicode pathName,
+                   VmTimeType createTime,
+                   VmTimeType accessTime,
+                   VmTimeType writeTime,
+                   VmTimeType attrChangeTime);
 
-EXTERN Bool File_GetFilePermissions(ConstUnicode pathName,
-                                   int *mode);
+Bool File_GetFilePermissions(ConstUnicode pathName,
+                            int *mode);
 
-EXTERN Bool File_SetFilePermissions(ConstUnicode pathName,
-                                    int mode);
+Bool File_SetFilePermissions(ConstUnicode pathName,
+                             int mode);
 
-EXTERN Bool File_SupportsFileSize(ConstUnicode pathName,
-                                  uint64 fileSize);
+Bool File_SupportsFileSize(ConstUnicode pathName,
+                           uint64 fileSize);
 
-EXTERN Bool File_SupportsLargeFiles(ConstUnicode pathName);
+Bool File_SupportsLargeFiles(ConstUnicode pathName);
 
-EXTERN char *File_MapPathPrefix(const char *oldPath,
-                                const char **oldPrefixes,
-                                const char **newPrefixes,
-                                size_t numPrefixes);
+char *File_MapPathPrefix(const char *oldPath,
+                         const char **oldPrefixes,
+                         const char **newPrefixes,
+                         size_t numPrefixes);
 
-EXTERN Bool File_CopyFromFdToFd(FileIODescriptor src, 
-                                FileIODescriptor dst);
+Bool File_CopyFromFdToFd(FileIODescriptor src, 
+                         FileIODescriptor dst);
 
-EXTERN FileIOResult File_CreatePrompt(FileIODescriptor *file, 
-                                      ConstUnicode pathName, 
-                                      int access, 
-                                      int prompt);
+FileIOResult File_CreatePrompt(FileIODescriptor *file, 
+                               ConstUnicode pathName, 
+                               int access, 
+                               int prompt);
 
-EXTERN Bool File_CopyFromFd(FileIODescriptor src, 
-                            ConstUnicode dstName, 
-                            Bool overwriteExisting);
+Bool File_CopyFromFd(FileIODescriptor src, 
+                     ConstUnicode dstName, 
+                     Bool overwriteExisting);
 
-EXTERN Bool File_Copy(ConstUnicode srcName, 
-                      ConstUnicode dstName, 
-                      Bool overwriteExisting);
+Bool File_Copy(ConstUnicode srcName, 
+               ConstUnicode dstName, 
+               Bool overwriteExisting);
 
-EXTERN Bool File_CopyFromFdToName(FileIODescriptor src, 
-                                  ConstUnicode dstName, 
-                                  int dstDispose);
+Bool File_CopyFromFdToName(FileIODescriptor src, 
+                           ConstUnicode dstName, 
+                           int dstDispose);
 
-EXTERN Bool File_CopyFromNameToName(ConstUnicode srcName, 
-                                    ConstUnicode dstName, 
-                                    int dstDispose);
+Bool File_CopyFromNameToName(ConstUnicode srcName, 
+                             ConstUnicode dstName, 
+                             int dstDispose);
 
-EXTERN Bool File_Replace(ConstUnicode oldFile, 
-                         ConstUnicode newFile);
+Bool File_Replace(ConstUnicode oldFile, 
+                  ConstUnicode newFile);
 
-EXTERN Bool File_Rename(ConstUnicode oldFile, 
-                        ConstUnicode newFile);
+Bool File_Rename(ConstUnicode oldFile, 
+                 ConstUnicode newFile);
 
-EXTERN int64 File_GetSize(ConstUnicode pathName);
+int64 File_GetSize(ConstUnicode pathName);
 
-EXTERN int64 File_GetSizeByPath(ConstUnicode pathName);
+int64 File_GetSizeByPath(ConstUnicode pathName);
 
-EXTERN int64 File_GetSizeAlternate(ConstUnicode pathName);
+int64 File_GetSizeAlternate(ConstUnicode pathName);
 
 /* file change notification module */
 typedef void (*CbFunction)(void *clientData);
@@ -291,48 +296,48 @@ typedef void (*PollTimeout) (CbFunction f,
 typedef void (*PollRemoveTimeout) (CbFunction f,
                                    void *clientData);
 
-EXTERN void File_PollInit(PollTimeout pt, 
-                          PollRemoveTimeout prt);
+void File_PollInit(PollTimeout pt, 
+                   PollRemoveTimeout prt);
 
-EXTERN void File_PollExit(void);
+void File_PollExit(void);
 
-EXTERN void File_PollImpersonateOnCheck(Bool check);
+void File_PollImpersonateOnCheck(Bool check);
 
-EXTERN Bool File_PollAddFile(ConstUnicode pathName, 
-                             uint32 pollPeriod, 
-                             NotifyCallback callback, 
-                             void *data, 
-                             Bool fPeriodic);
+Bool File_PollAddFile(ConstUnicode pathName, 
+                      uint32 pollPeriod, 
+                      NotifyCallback callback, 
+                      void *data, 
+                      Bool fPeriodic);
 
-EXTERN Bool File_PollAddDirFile(ConstUnicode pathName,
-                                uint32 pollPeriod, 
-                                NotifyCallback callback,
-                                void *data, 
-                                Bool fPeriodic);
+Bool File_PollAddDirFile(ConstUnicode pathName,
+                         uint32 pollPeriod, 
+                         NotifyCallback callback,
+                         void *data, 
+                         Bool fPeriodic);
 
-EXTERN Bool File_PollRemoveFile(ConstUnicode pathName, 
-                                uint32 pollPeriod,
-                                NotifyCallback callback);
+Bool File_PollRemoveFile(ConstUnicode pathName, 
+                         uint32 pollPeriod,
+                         NotifyCallback callback);
 
-EXTERN Bool File_IsSameFile(ConstUnicode path1,
-                            ConstUnicode path2);
+Bool File_IsSameFile(ConstUnicode path1,
+                     ConstUnicode path2);
 
-EXTERN char *File_PrependToPath(const char *searchPath,
-                                const char *elem);
+char *File_PrependToPath(const char *searchPath,
+                         const char *elem);
 
-EXTERN Bool File_FindFileInSearchPath(const char *file,
-                                      const char *searchPath,
-                                      const char *cwd,
-                                      char **result);
+Bool File_FindFileInSearchPath(const char *file,
+                               const char *searchPath,
+                               const char *cwd,
+                               char **result);
 
-EXTERN Unicode File_ReplaceExtension(ConstUnicode pathName,
-                                     ConstUnicode newExtension,
-                                     uint32 numExtensions,
-                                     ...);
+Unicode File_ReplaceExtension(ConstUnicode pathName,
+                              ConstUnicode newExtension,
+                              uint32 numExtensions,
+                              ...);
 
-EXTERN Bool File_MakeCfgFileExecutable(ConstUnicode pathName);
+Bool File_MakeCfgFileExecutable(ConstUnicode pathName);
 
-EXTERN char *File_ExpandAndCheckDir(const char *dirName);
+char *File_ExpandAndCheckDir(const char *dirName);
 
 #ifdef __cplusplus
 } // extern "C" {