Hgfs Server: Very minor clean up of server callback table

Another very minor clean up for final part for making the Hgfs server
callback table constant.

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
index 33d7ec52f552b4e6c8b307244ee21cd9f721f670..95cbb220c34947d2bdbaf0728404fd08635b1d9d 100644 (file)
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -241,7 +241,7 @@ static HgfsSharedFolderHandle HgfsServerRegisterShare(const char *shareName,
 /*
  * Callback table passed to transport and any channels.
  */
-HgfsServerCallbacks gHgfsServerCBTable = {
+static const HgfsServerCallbacks gHgfsServerCBTable = {
    {
       HgfsServerSessionConnect,
       HgfsServerSessionDisconnect,
@@ -3824,7 +3824,7 @@ HgfsServerGetShareName(HgfsSharedFolderHandle sharedFolder, // IN: Notify handle
  */
 
 Bool
-HgfsServer_InitState(HgfsServerCallbacks **callbackTable,         // IN/OUT: our callbacks
+HgfsServer_InitState(const HgfsServerCallbacks **callbackTable,   // IN/OUT: our callbacks
                      HgfsServerConfig *serverCfgData,             // IN: configurable settings
                      HgfsServerMgrCallbacks *serverMgrData)       // IN: mgr callback
 {

diff --git a/open-vm-tools/lib/hgfsServerManagerGuest/hgfsChannelGuest.c b/open-vm-tools/lib/hgfsServerManagerGuest/hgfsChannelGuest.c
index 6b960eee0799c4b971faff4ae70e44eb24776e7e..60a67d408d555f9915de82812cf7efed3e94cb42 100644 (file)
--- a/open-vm-tools/lib/hgfsServerManagerGuest/hgfsChannelGuest.c
+++ b/open-vm-tools/lib/hgfsServerManagerGuest/hgfsChannelGuest.c
@@ -197,7 +197,7 @@ HgfsChannelInitServer(HgfsServerMgrCallbacks *mgrCb,       // IN: server manager
    Debug("%s: Initialize Hgfs server.\n", __FUNCTION__);
 
    /* If we have a new connection initialize the server session with default settings. */
-   result = HgfsServer_InitState((HgfsServerCallbacks **)&serverInfo->serverCBTable,
+   result = HgfsServer_InitState(&serverInfo->serverCBTable,
                                  &gHgfsGuestCfgSettings,
                                  mgrCb);
    if (!result) {

diff --git a/open-vm-tools/lib/include/hgfsServer.h b/open-vm-tools/lib/include/hgfsServer.h
index 4901c255befd2ca0430755d5c44b25ea94557857..dc9a0c6211e2eb8333e284d4a6c69733a8aabced 100644 (file)
--- a/open-vm-tools/lib/include/hgfsServer.h
+++ b/open-vm-tools/lib/include/hgfsServer.h
@@ -202,7 +202,7 @@ typedef struct HgfsServerCallbacks {
    HgfsRegisterSharedFolderFunc registerShare;
 } HgfsServerCallbacks;
 
-Bool HgfsServer_InitState(HgfsServerCallbacks **,
+Bool HgfsServer_InitState(const HgfsServerCallbacks **,
                           HgfsServerConfig *,
                           HgfsServerMgrCallbacks *);
 void HgfsServer_ExitState(void);