HGFS: Clean up server send packet callback

While cleaning up the usage of the HGFS packet abstraction it meant that
the arguments to the HGFS server packet send callback could be cleaned up.
The arguments for the packet buffer and size are now unused as this too
arguments are extracted from the HGFS packet object.
Therefore, remove the unused arguments from the send callback.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
index 1b670cbb669779208694b0dde7ea39c51500ee4d..86a7f2f0af061ab28ed906be77b0bc4ce48912dc 100644 (file)
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -4590,8 +4590,8 @@ HgfsPacketSend(HgfsPacket *packet,            // IN/OUT: Hgfs Packet
    if (transportSession->state == HGFS_SESSION_STATE_OPEN) {
       ASSERT(transportSession->type == HGFS_SESSION_TYPE_REGULAR);
       result = transportSession->channelCbTable->send(transportSession->transportData,
-                                                      packet, packetOut,
-                                                      packetOutLen, flags);
+                                                      packet,
+                                                      flags);
    }
 
    if (notificationNeeded) {

diff --git a/open-vm-tools/lib/hgfsServerManagerGuest/hgfsChannelGuestBd.c b/open-vm-tools/lib/hgfsServerManagerGuest/hgfsChannelGuestBd.c
index 52c02369344d4930920a26a3be91f8ddcb969d3b..72c9905336eced73ec7051f2c40d46f216e9f013 100644 (file)
--- a/open-vm-tools/lib/hgfsServerManagerGuest/hgfsChannelGuestBd.c
+++ b/open-vm-tools/lib/hgfsServerManagerGuest/hgfsChannelGuestBd.c
@@ -60,8 +60,6 @@ static Bool HgfsChannelGuestBdInit(HgfsServerSessionCallbacks *serverCBTable,
 static void HgfsChannelGuestBdExit(HgfsGuestConn *data);
 static Bool HgfsChannelGuestBdSend(void *data,
                                    HgfsPacket *packet,
-                                   char *buffer,
-                                   size_t bufferLen,
                                    HgfsSendFlags flags);
 static Bool HgfsChannelGuestBdReceive(HgfsGuestConn *data,
                                       char const *packetIn,
@@ -633,8 +631,6 @@ HgfsChannelGuestBdInvalidateInactiveSessions(HgfsGuestConn *connData)  // IN: co
 static Bool
 HgfsChannelGuestBdSend(void *conn,              // IN: our connection data
                        HgfsPacket *packet,      // IN/OUT: Hgfs Packet
-                       char *buffer,            // IN: unused reply in hgfs packet
-                       size_t bufferLen,        // IN: unused reply len in hgfs packet
                        HgfsSendFlags flags)     // IN: Flags to say how to process
 {
    HgfsGuestConn *connData = conn;

diff --git a/open-vm-tools/lib/include/hgfsServer.h b/open-vm-tools/lib/include/hgfsServer.h
index 40956b3d0861c0c4e385d44224639177f27a0fdf..e0f3974a79d13bbd82c06220a2a5d9f4bb023f85 100644 (file)
--- a/open-vm-tools/lib/include/hgfsServer.h
+++ b/open-vm-tools/lib/include/hgfsServer.h
@@ -137,8 +137,6 @@ typedef struct HgfsServerConfig {
 
 typedef Bool (*HgfsChannelSendFunc)(void *opaqueSession,
                                     HgfsPacket *packet,
-                                    char *buffer,
-                                    size_t bufferLen,
                                     HgfsSendFlags flags);
 typedef void * (*HgfsChannelMapVirtAddrFunc)(uint64 pa, uint32 size, void **context);
 typedef void (*HgfsChannelUnmapVirtAddrFunc)(void **context);