From: VMware, Inc <>
Date: Tue, 17 Nov 2009 21:46:28 +0000 (-0800)
Subject: Re-organize the Tools Core public headers (2/2).
X-Git-Tag: 2009.11.16-210370~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1703bea751f8d3271a76b8fe9cd710b9954e26d7;p=thirdparty%2Fopen-vm-tools.git

Re-organize the Tools Core public headers (2/2).

Fix all files that reference the old headers. No real code changes
here.

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

diff --git a/open-vm-tools/hgfsclient/hgfsclient.c b/open-vm-tools/hgfsclient/hgfsclient.c
index efc5fd216..f387483bc 100644
--- a/open-vm-tools/hgfsclient/hgfsclient.c
+++ b/open-vm-tools/hgfsclient/hgfsclient.c
@@ -34,7 +34,7 @@
 #include "hgfsProto.h"
 #include "conf.h"
 #include "str.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 #include "hgfsclient_version.h"
 #include "embed_version.h"
diff --git a/open-vm-tools/lib/rpcChannel/rpcChannelInt.h b/open-vm-tools/lib/rpcChannel/rpcChannelInt.h
index f58f0465b..67aef37a4 100644
--- a/open-vm-tools/lib/rpcChannel/rpcChannelInt.h
+++ b/open-vm-tools/lib/rpcChannel/rpcChannelInt.h
@@ -25,7 +25,7 @@
  *    Internal definitions for the RPC channel library.
  */
 
-#include "rpcChannel.h"
+#include "vmware/tools/guestrpc.h"
 
 void
 RpcChannel_Error(void *_state,
diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c
index 3fbd342de..3984203f1 100644
--- a/open-vm-tools/lib/rpcIn/rpcin.c
+++ b/open-vm-tools/lib/rpcIn/rpcin.c
@@ -45,7 +45,7 @@
 #endif
 
 #if defined(VMTOOLS_USE_GLIB)
-#  include "rpcChannel.h"
+#  include "vmware/tools/guestrpc.h"
 #endif
 
 #include "vmware.h"
diff --git a/open-vm-tools/libvmtools/signalSource.c b/open-vm-tools/libvmtools/signalSource.c
index a35b1dcab..0e8ea354c 100644
--- a/open-vm-tools/libvmtools/signalSource.c
+++ b/open-vm-tools/libvmtools/signalSource.c
@@ -28,7 +28,7 @@
  */
 
 #include "vm_assert.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/open-vm-tools/libvmtools/vmtools.c b/open-vm-tools/libvmtools/vmtools.c
index fde18b76f..544a49188 100644
--- a/open-vm-tools/libvmtools/vmtools.c
+++ b/open-vm-tools/libvmtools/vmtools.c
@@ -34,8 +34,8 @@
 #endif
 
 #include "vm_assert.h"
-#include "vmtools.h"
 #include "wiper.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/libvmtools/vmtoolsConfig.c b/open-vm-tools/libvmtools/vmtoolsConfig.c
index 32489324e..db7b262d5 100644
--- a/open-vm-tools/libvmtools/vmtoolsConfig.c
+++ b/open-vm-tools/libvmtools/vmtoolsConfig.c
@@ -23,12 +23,12 @@
  *    automatically migrating from old-style tools configuration files.
  */
 
+#include "vmware/tools/utils.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#include "vmtools.h"
 #include "conf.h"
 #include "file.h"
 #include "guestApp.h"
diff --git a/open-vm-tools/libvmtools/vmtoolsLog.c b/open-vm-tools/libvmtools/vmtoolsLog.c
index 815f781e2..d0821209d 100644
--- a/open-vm-tools/libvmtools/vmtoolsLog.c
+++ b/open-vm-tools/libvmtools/vmtoolsLog.c
@@ -28,6 +28,7 @@
  *    before including glib.h.
  */
 
+#include "vmware/tools/utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <glib/gstdio.h>
@@ -37,7 +38,6 @@
 #  include <unistd.h>
 #endif
 
-#include "vmtools.h"
 #include "codeset.h"
 #if defined(G_PLATFORM_WIN32)
 #  include "coreDump.h"
diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
index de70c1e83..c5cd10ea0 100644
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
@@ -46,18 +46,17 @@
 #include "guestInfoInt.h"
 #include "guest_msg_def.h" // For GUESTMSG_MAX_IN_SIZE
 #include "netutil.h"
-#include "rpcChannel.h"
 #include "rpcvmx.h"
 #include "procMgr.h"
 #include "str.h"
 #include "strutil.h"
 #include "system.h"
 #include "util.h"
-#include "vmtools.h"
-#include "vmtoolsApp.h"
 #include "xdrutil.h"
 #include "vmsupport.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
index da72a75c4..3a88cf534 100644
--- a/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
+++ b/open-vm-tools/services/plugins/hgfsServer/hgfsPlugin.c
@@ -25,15 +25,15 @@
 #include <string.h>
 
 #define G_LOG_DOMAIN "hgfsd"
-#include "vmtoolsApp.h"
 
 #include "hgfs.h"
 #include "hgfsServerPolicy.h"
 #include "hgfsServer.h"
 #include "hgfsChannel.h"
 #include "vm_assert.h"
-#include "vmtools.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/services/plugins/powerOps/powerOps.c b/open-vm-tools/services/plugins/powerOps/powerOps.c
index ebc10fa9a..ba3c05369 100644
--- a/open-vm-tools/services/plugins/powerOps/powerOps.c
+++ b/open-vm-tools/services/plugins/powerOps/powerOps.c
@@ -26,13 +26,13 @@
 
 #include "vm_assert.h"
 #include "vm_basic_defs.h"
-#include "vmtoolsApp.h"
 
 #include "conf.h"
 #include "procMgr.h"
 #include "system.h"
-#include "vmtools.h"
 #include "vmware/guestrpc/powerops.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if defined(G_PLATFORM_WIN32)
 #  define INVALID_PID NULL
diff --git a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
index 75631752c..455de62ea 100644
--- a/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
+++ b/open-vm-tools/services/plugins/resolutionSet/resolutionSet.c
@@ -34,10 +34,10 @@
 
 #include "resolutionInt.h"
 
-#include "vmtools.h"
-#include "vmtoolsApp.h"
 #include "xdrutil.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 /*
  * The maximum number of capabilities we can set.
diff --git a/open-vm-tools/services/plugins/timeSync/timeSync.c b/open-vm-tools/services/plugins/timeSync/timeSync.c
index 73bdd365b..287c111f2 100644
--- a/open-vm-tools/services/plugins/timeSync/timeSync.c
+++ b/open-vm-tools/services/plugins/timeSync/timeSync.c
@@ -34,9 +34,9 @@
 #include "msg.h"
 #include "strutil.h"
 #include "system.h"
-#include "vmtools.h"
-#include "vmtoolsApp.h"
 #include "vmware/guestrpc/timesync.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
index f9f4c2f7d..c6856b3e5 100644
--- a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
+++ b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.c
@@ -57,7 +57,7 @@
 
 #if defined(VMTOOLS_USE_GLIB)
 #  include "vixPluginInt.h"
-#  include "vmtools.h"
+#  include "vmware/tools/utils.h"
 #else
 #  include "debug.h"
 #  include "eventManager.h"
diff --git a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.h b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.h
index 962395826..8f7aa174a 100644
--- a/open-vm-tools/services/plugins/vix/foundryToolsDaemon.h
+++ b/open-vm-tools/services/plugins/vix/foundryToolsDaemon.h
@@ -31,7 +31,7 @@
 
 #if defined(VMTOOLS_USE_GLIB)
 
-#include "vmtoolsApp.h"
+#include "vmware/tools/plugin.h"
 
 void
 FoundryToolsDaemon_Initialize(ToolsAppCtx *ctx);
diff --git a/open-vm-tools/services/plugins/vix/vixPlugin.c b/open-vm-tools/services/plugins/vix/vixPlugin.c
index d236da696..9ff6d7b08 100644
--- a/open-vm-tools/services/plugins/vix/vixPlugin.c
+++ b/open-vm-tools/services/plugins/vix/vixPlugin.c
@@ -31,7 +31,7 @@
 #include "syncDriver.h"
 #include "vixCommands.h"
 #include "vixPluginInt.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/services/plugins/vix/vixPluginInt.h b/open-vm-tools/services/plugins/vix/vixPluginInt.h
index 3a36da395..ebe7e16ae 100644
--- a/open-vm-tools/services/plugins/vix/vixPluginInt.h
+++ b/open-vm-tools/services/plugins/vix/vixPluginInt.h
@@ -28,7 +28,7 @@
 #define Debug        g_debug
 #define Warning      g_warning
 
-#include "vmtoolsApp.h"
+#include "vmware/tools/plugin.h"
 #include "rpcin.h"
 
 RpcInRet
diff --git a/open-vm-tools/services/plugins/vixUser/vixUser.c b/open-vm-tools/services/plugins/vixUser/vixUser.c
index 52471ccec..40821ac63 100644
--- a/open-vm-tools/services/plugins/vixUser/vixUser.c
+++ b/open-vm-tools/services/plugins/vixUser/vixUser.c
@@ -34,9 +34,9 @@
 #include "strutil.h"
 #include "vixCommands.h"
 #include "vixTools.h"
-#include "vmtools.h"
-#include "vmtoolsApp.h"
 #include "util.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #if defined(_WIN32)
 #  include "win32u.h"
diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
index 126eefc6a..c49bd3e14 100644
--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
@@ -40,7 +40,7 @@
 #include "str.h"
 #include "strutil.h"
 #include "util.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h b/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
index 3efc00442..c2203c0ea 100644
--- a/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
+++ b/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
@@ -29,8 +29,8 @@
 
 #include <glib.h>
 #include "vmware.h"
-#include "vmtoolsApp.h"
 #include "vmware/guestrpc/vmbackup.h"
+#include "vmware/tools/plugin.h"
 
 typedef enum {
    VMBACKUP_STATUS_PENDING,
diff --git a/open-vm-tools/services/vmtoolsd/cmdLine.c b/open-vm-tools/services/vmtoolsd/cmdLine.c
index 7f487cf16..6cbd60464 100644
--- a/open-vm-tools/services/vmtoolsd/cmdLine.c
+++ b/open-vm-tools/services/vmtoolsd/cmdLine.c
@@ -37,8 +37,8 @@
 #include "conf.h"
 #include "rpcout.h"
 #include "str.h"
-#include "vmtools.h"
 #include "vmtoolsd_version.h"
+#include "vmware/tools/utils.h"
 
 
 /**
diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index 8fd5627a6..6ae9aa027 100644
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -38,8 +38,8 @@
 #include "system.h"
 #include "util.h"
 #include "vmcheck.h"
-#include "vmtools.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/utils.h"
 
 
 /**
diff --git a/open-vm-tools/services/vmtoolsd/mainPosix.c b/open-vm-tools/services/vmtoolsd/mainPosix.c
index 0f2c13325..66647cd09 100644
--- a/open-vm-tools/services/vmtoolsd/mainPosix.c
+++ b/open-vm-tools/services/vmtoolsd/mainPosix.c
@@ -34,7 +34,7 @@
 #include "system.h"
 #include "unicode.h"
 #include "util.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/services/vmtoolsd/pluginMgr.c b/open-vm-tools/services/vmtoolsd/pluginMgr.c
index 08eb90942..95f17c4c8 100644
--- a/open-vm-tools/services/vmtoolsd/pluginMgr.c
+++ b/open-vm-tools/services/vmtoolsd/pluginMgr.c
@@ -27,7 +27,7 @@
 #include "guestApp.h"
 #include "toolsCoreInt.h"
 #include "util.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 
 #ifdef USE_APPLOADER
diff --git a/open-vm-tools/services/vmtoolsd/serviceObj.c b/open-vm-tools/services/vmtoolsd/serviceObj.c
index b6937a20c..30394dda9 100644
--- a/open-vm-tools/services/vmtoolsd/serviceObj.c
+++ b/open-vm-tools/services/vmtoolsd/serviceObj.c
@@ -25,7 +25,6 @@
 #include "toolsCoreInt.h"
 #include "serviceObj.h"
 #include "svcSignals.h"
-#include "vmtoolsApp.h"
 
 
 /**
diff --git a/open-vm-tools/services/vmtoolsd/serviceObj.h b/open-vm-tools/services/vmtoolsd/serviceObj.h
index 4b771f3da..a46a27d02 100644
--- a/open-vm-tools/services/vmtoolsd/serviceObj.h
+++ b/open-vm-tools/services/vmtoolsd/serviceObj.h
@@ -29,7 +29,6 @@
  */
 
 #include <glib-object.h>
-#include "vmtoolsApp.h"
 
 #define TOOLSCORE_TYPE_SERVICE   ToolsCore_Service_get_type()
 
diff --git a/open-vm-tools/services/vmtoolsd/svcSignals.gm b/open-vm-tools/services/vmtoolsd/svcSignals.gm
index 957a6f845..37629ed15 100644
--- a/open-vm-tools/services/vmtoolsd/svcSignals.gm
+++ b/open-vm-tools/services/vmtoolsd/svcSignals.gm
@@ -21,7 +21,7 @@
 #
 # Defines the custom GClosure marshal functions for the core services signals.
 #
-# @see vmtoolsApp.h
+# @see plugin.h
 #
 
 # The "capabilities" signal.
diff --git a/open-vm-tools/services/vmtoolsd/toolsCoreInt.h b/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
index 4464c7153..1dc8dc8a3 100644
--- a/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
+++ b/open-vm-tools/services/vmtoolsd/toolsCoreInt.h
@@ -31,8 +31,8 @@
 #include <glib-object.h>
 #include <gmodule.h>
 #include <time.h>
-#include "vmrpcdbg.h"
-#include "vmtoolsApp.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/rpcdebug.h"
 
 /* Used by the Windows implementation to communicate with other processes. */
 #if defined(G_PLATFORM_WIN32)
diff --git a/open-vm-tools/services/vmtoolsd/toolsRpc.c b/open-vm-tools/services/vmtoolsd/toolsRpc.c
index 897901b4a..1670efdfe 100644
--- a/open-vm-tools/services/vmtoolsd/toolsRpc.c
+++ b/open-vm-tools/services/vmtoolsd/toolsRpc.c
@@ -32,8 +32,8 @@
 #include "str.h"
 #include "strutil.h"
 #include "toolsCoreInt.h"
-#include "vmtools.h"
 #include "vm_tools_version.h"
+#include "vmware/tools/utils.h"
 
 
 /**
diff --git a/open-vm-tools/tests/testDebug/testDebug.c b/open-vm-tools/tests/testDebug/testDebug.c
index 11201db71..0aa3f9e5f 100644
--- a/open-vm-tools/tests/testDebug/testDebug.c
+++ b/open-vm-tools/tests/testDebug/testDebug.c
@@ -27,10 +27,9 @@
 #define G_LOG_DOMAIN "testDebug"
 #include <glib-object.h>
 #include "util.h"
-#include "vmrpcdbg.h"
-#include "vmtools.h"
 #include "guestrpc/ghiGetBinaryHandlers.h"
 #include "vmware/guestrpc/tclodefs.h"
+#include "vmware/tools/rpcdebug.h"
 
 static gboolean
 TestDebugValidateReset(RpcInData *data, gboolean ret);
diff --git a/open-vm-tools/tests/testPlugin/testPlugin.c b/open-vm-tools/tests/testPlugin/testPlugin.c
index aedc5e7c9..f7ef4fe8c 100644
--- a/open-vm-tools/tests/testPlugin/testPlugin.c
+++ b/open-vm-tools/tests/testPlugin/testPlugin.c
@@ -30,9 +30,9 @@
 #include <gmodule.h>
 #include "testData.h"
 #include "util.h"
-#include "vmtoolsApp.h"
-#include "vmtools.h"
 #include "guestrpc/ghiGetBinaryHandlers.h"
+#include "vmware/tools/plugin.h"
+#include "vmware/tools/utils.h"
 
 #define TEST_APP_PROVIDER  "TestProvider"
 #define TEST_APP_NAME      "TestProviderApp1"
diff --git a/open-vm-tools/tests/vmrpcdbg/debugChannel.c b/open-vm-tools/tests/vmrpcdbg/debugChannel.c
index fd68994a6..94947509a 100644
--- a/open-vm-tools/tests/vmrpcdbg/debugChannel.c
+++ b/open-vm-tools/tests/vmrpcdbg/debugChannel.c
@@ -30,11 +30,11 @@
 #include <gmodule.h>
 
 #include "strutil.h"
-#include "vmrpcdbg.h"
-#include "vmtools.h"
 #include "util.h"
 #include "vmxrpc.h"
 #include "xdrutil.h"
+#include "vmware/tools/rpcdebug.h"
+#include "vmware/tools/utils.h"
 
 typedef struct DbgChannelData {
    gboolean          hasLibRef;
diff --git a/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c b/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
index e072477f0..efe5655ea 100644
--- a/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
+++ b/open-vm-tools/tests/vmrpcdbg/vmrpcdbg.c
@@ -27,7 +27,7 @@
 #include <gmodule.h>
 #include <rpc/rpc.h>
 #include "util.h"
-#include "vmrpcdbg.h"
+#include "vmware/tools/rpcdebug.h"
 
 #if !defined(__APPLE__)
 #include "embed_version.h"
diff --git a/open-vm-tools/toolbox/toolboxInt.c b/open-vm-tools/toolbox/toolboxInt.c
index 4195b3c14..889b8fa8f 100644
--- a/open-vm-tools/toolbox/toolboxInt.c
+++ b/open-vm-tools/toolbox/toolboxInt.c
@@ -30,7 +30,7 @@
 #include "debug.h"
 #include "guestApp.h"
 #include "util.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 
 /*
diff --git a/open-vm-tools/toolbox/toolboxcmd-scripts.c b/open-vm-tools/toolbox/toolboxcmd-scripts.c
index 24e741a67..ee51f424d 100644
--- a/open-vm-tools/toolbox/toolboxcmd-scripts.c
+++ b/open-vm-tools/toolbox/toolboxcmd-scripts.c
@@ -30,7 +30,7 @@
 
 #include "system.h"
 #include "toolboxCmdInt.h"
-#include "vmtools.h"
+#include "vmware/tools/utils.h"
 
 
 #define SCRIPT_SUSPEND "suspend"