Move guestInfo library function definitions to bora-vmsoft.

These functions are not part of the public interface defined in
the public guestInfo.h file.

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

diff --git a/open-vm-tools/lib/include/guestInfo.h b/open-vm-tools/lib/include/guestInfo.h
index dd1609931cba9540b87fb10917672876a951c279..90dc999cb87f93422ce66636598a23b347c3ba24 100644 (file)
--- a/open-vm-tools/lib/include/guestInfo.h
+++ b/open-vm-tools/lib/include/guestInfo.h
@@ -105,25 +105,6 @@ typedef struct _DiskInfo {
    PPartitionEntry partitionList;
 } GuestDiskInfo, *PGuestDiskInfo;
 
-
-
-/*
- * Global functions
- *
- * XXX These belong in a bora-vmsoft header.
- */
-
-#ifndef N_PLAT_NLM
-extern Bool GuestInfo_GetFqdn(int outBufLen, char fqdn[]);
-extern Bool GuestInfo_GetNicInfo(NicInfoV3 **nicInfo);
-extern void GuestInfo_FreeNicInfo(NicInfoV3 *nicInfo);
-extern Bool GuestInfo_GetDiskInfo(PGuestDiskInfo di);
-extern Bool GuestInfo_GetOSName(unsigned int outBufFullLen,
-                                unsigned int outBufLen, char *osNameFull,
-                                char *osName);
-extern int GuestInfo_GetSystemBitness(void);
-#endif // #ifndef N_PLAT_NLM
-
 /**
  * @}
  */

diff --git a/open-vm-tools/lib/include/guestInfoLib.h b/open-vm-tools/lib/include/guestInfoLib.h
index 6ce63e4d7177c7656d5b662b4fc74990b1059be7..c704e503f0621085e6911efd0edd50f9a269b67f 100644 (file)
--- a/open-vm-tools/lib/include/guestInfoLib.h
+++ b/open-vm-tools/lib/include/guestInfoLib.h
@@ -26,9 +26,32 @@
  */
 
 #include "vm_basic_types.h"
+#include "guestInfo.h"
 
 uint64
 GuestInfo_GetAvailableDiskSpace(char *pathName);
 
+Bool
+GuestInfo_GetFqdn(int outBufLen,
+                  char fqdn[]);
+
+Bool
+GuestInfo_GetNicInfo(NicInfoV3 **nicInfo);
+
+void
+GuestInfo_FreeNicInfo(NicInfoV3 *nicInfo);
+
+Bool
+GuestInfo_GetDiskInfo(PGuestDiskInfo di);
+
+Bool
+GuestInfo_GetOSName(unsigned int outBufFullLen,
+                    unsigned int outBufLen,
+                    char *osNameFull,
+                    char *osName);
+
+int
+GuestInfo_GetSystemBitness(void);
+
 #endif /* _GUESTINFOLIB_H_ */
 

diff --git a/open-vm-tools/lib/vixTools/vixTools.c b/open-vm-tools/lib/vixTools/vixTools.c
index b7523bf309dba7b7f87077dadb693287103170af..426f68f6f44d358ef8b94eda626b05936182e197 100644 (file)
--- a/open-vm-tools/lib/vixTools/vixTools.c
+++ b/open-vm-tools/lib/vixTools/vixTools.c
@@ -69,7 +69,7 @@
 #include "conf.h"
 #include "vixCommands.h"
 #include "base64.h"
-#include "guestInfo.h"
+#include "guestInfoLib.h"
 #include "hostinfo.h"
 #include "hgfsServer.h"
 #include "hgfs.h"

diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoInt.h b/open-vm-tools/services/plugins/guestInfo/guestInfoInt.h
index a79538c78934542dddf75a1502b1e56a4e3ac8c2..8b2ac113bca3936a8ccea5824650dd673211d1b6 100644 (file)
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoInt.h
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoInt.h
@@ -22,7 +22,7 @@
  * Declares internal functions of the guestInfo plugin.
  */
 
-#include "guestInfo.h"
+#include "guestInfoLib.h"
 #define G_LOG_DOMAIN "guestinfo"
 
 extern int guestInfoPollInterval;