From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:26:09 +0000 (-0700)
Subject: HGFS: Clean up of server packet send
X-Git-Tag: 2013.09.16-1328054~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb245cb3633d0f4078ea61c8f8ece54bacc4d855;p=thirdparty%2Fopen-vm-tools.git

HGFS: Clean up of server packet send

Make packet the send function local to the only file where it is used.

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 fa0fdb5ad..71ab60626 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -349,6 +349,11 @@ static void HgfsFreeSearchDirents(HgfsSearch *search);
 static HgfsInternalStatus
 HgfsServerTransportGetDefaultSession(HgfsTransportSessionInfo *transportSession,
                                      HgfsSessionInfo **session);
+static Bool HgfsPacketSend(HgfsPacket *packet,
+                           char *packetOut,
+                           size_t packetOutLen,
+                           HgfsTransportSessionInfo *transportSession,
+                           HgfsSendFlags flags);
 
 /*
  * Opcode handlers
@@ -4567,7 +4572,7 @@ HgfsNotifyPacketSent(void)
  *----------------------------------------------------------------------------
  */
 
-Bool
+static Bool
 HgfsPacketSend(HgfsPacket *packet,            // IN/OUT: Hgfs Packet
                char *packetOut,               // IN: output buffer
                size_t packetOutLen,           // IN: packet size
diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerInt.h b/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
index a282a3784..6088b1fbc 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
+++ b/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
@@ -643,15 +643,6 @@ char*
 HgfsServerGetTargetRelativePath(const char* source,    // IN: source file name
                                 const char* target);   // IN: target file name
 
-
-
-Bool
-HgfsPacketSend(HgfsPacket *packet,            // IN/OUT: Hgfs Packet
-               char *packetOut,               // IN: Output packet buffer
-               size_t packetOutLen,           // IN: Output packet size
-               HgfsTransportSessionInfo *transportSession,      // IN: session info
-               HgfsSendFlags flags);          // IN: flags how to send
-
 Bool
 HgfsServerCheckOpenFlagsForShare(HgfsFileOpenInfo *openInfo, // IN: Hgfs file handle
                                  HgfsOpenFlags *flags);      // IN/OUT: open mode