From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:33 +0000 (-0700)
Subject: Hgfs Server: Very minor clean up of server callback table
X-Git-Tag: stable-10.2.0~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fedc4083703a4438bb33617e9a56bacda41fd39;p=thirdparty%2Fopen-vm-tools.git

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 33d7ec52f..95cbb220c 100644
--- 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 6b960eee0..60a67d408 100644
--- 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 4901c255b..dc9a0c621 100644
--- 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);