HGFS: Make server use of const more consistent

In particular we see const void * and void const * intermixed and so
now make the server code consisten in its use and stick with the
const void * format.

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 942ab58a31eb37219457fc81172f39a81e5bc184..05aff1d43185e2fadd347f43687df2964432d788 100644 (file)
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -137,7 +137,7 @@ typedef struct HgfsInputParam {
    HgfsSessionInfo *session;     /* Hgfs session data */
    HgfsTransportSessionInfo *transportSession;
    HgfsPacket *packet;           /* Public (server/transport) Hgfs packet */
-   void const *payload;          /* Hgfs operation request */
+   const void *payload;          /* Hgfs operation request */
    uint32 payloadOffset;         /* Offset to start of Hgfs operation request */
    size_t payloadSize;           /* Hgfs operation request size */
    HgfsOp op;                    /* Hgfs operation command code */
@@ -2877,7 +2877,7 @@ static void
 HgfsServerInputAllocInit(HgfsPacket *packet,                        // IN: packet
                          HgfsTransportSessionInfo *transportSession,// IN: session
                          HgfsSessionInfo *session,                  // IN: session Id
-                         void const *request,                       // IN: HGFS packet
+                         const void *request,                       // IN: HGFS packet
                          size_t requestSize,                        // IN: request packet size
                          Bool sessionEnabled,                       // IN: session enabled request
                          uint32 requestId,                          // IN: unique request id
@@ -5735,7 +5735,7 @@ HgfsCreateAndCacheFileNode(HgfsFileOpenInfo *openInfo, // IN: Open info struct
 
 void *
 HgfsAllocInitReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                   void const *packetHeader,     // IN: packet header
+                   const void *packetHeader,     // IN: packet header
                    size_t replyDataSize,         // IN: replyDataSize size
                    HgfsSessionInfo *session)     // IN: Session Info
 {

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerInt.h b/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
index 8a69ef9163bdbc93584f4e165abeb17124a87924..39513a39510715cdd2112727fe9ed26eb17dfd12 100644 (file)
--- a/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
+++ b/open-vm-tools/lib/hgfsServer/hgfsServerInt.h
@@ -578,7 +578,7 @@ HgfsInternalStatus HgfsServerTransportAddSessionToList(HgfsTransportSessionInfo
 
 void *
 HgfsAllocInitReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                   void const *packetHeader,     // IN: incoming packet header
+                   const void *packetHeader,     // IN: incoming packet header
                    size_t replyDataSize,         // IN: payload size
                    HgfsSessionInfo *session);    // IN: Session Info
 

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerParameters.c b/open-vm-tools/lib/hgfsServer/hgfsServerParameters.c
index 2a52ec89f70f1c46386a27011ca8c74a682c6b8a..7245911703cc40f0b9ed8ad3e982e697f6d32a4c 100644 (file)
--- a/open-vm-tools/lib/hgfsServer/hgfsServerParameters.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServerParameters.c
@@ -375,7 +375,7 @@ exit:
  */
 
 HgfsInternalStatus
-HgfsUnpackPacketParams(void const *packet,      // IN: HGFS packet
+HgfsUnpackPacketParams(const void *packet,      // IN: HGFS packet
                        size_t packetSize,       // IN: request packet size
                        Bool *sessionEnabled,    // OUT: session enabled request
                        uint64 *sessionId,       // OUT: session Id
@@ -673,7 +673,7 @@ HgfsUnpackOpenPayloadV3(const HgfsRequestOpenV3 *requestV3, // IN: request paylo
  */
 
 Bool
-HgfsUnpackOpenRequest(void const *packet,         // IN: HGFS packet
+HgfsUnpackOpenRequest(const void *packet,         // IN: HGFS packet
                       size_t packetSize,          // IN: packet size
                       HgfsOp op,                  // IN: requested operation
                       HgfsFileOpenInfo *openInfo) // IN/OUT: open info structure
@@ -953,7 +953,7 @@ HgfsPackOpenV1Reply(HgfsFileOpenInfo *openInfo,   // IN: open info struct
 
 Bool
 HgfsPackOpenReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                  void const *packetHeader,     // IN: packet header
+                  const void *packetHeader,     // IN: packet header
                   HgfsFileOpenInfo *openInfo,   // IN: open info struct
                   size_t *payloadSize,          // OUT: size of packet
                   HgfsSessionInfo *session)     // IN: Session info
@@ -1083,7 +1083,7 @@ HgfsUnpackClosePayloadV3(const HgfsRequestCloseV3 *requestV3, // IN: payload
  */
 
 Bool
-HgfsUnpackCloseRequest(void const *packet,  // IN: request packet
+HgfsUnpackCloseRequest(const void *packet,  // IN: request packet
                        size_t packetSize,   // IN: request packet size
                        HgfsOp op,           // IN: request type
                        HgfsHandle *file)    // OUT: Handle to close
@@ -1136,7 +1136,7 @@ HgfsUnpackCloseRequest(void const *packet,  // IN: request packet
 
 Bool
 HgfsPackCloseReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                   void const *packetHeader,   // IN: packet header
+                   const void *packetHeader,   // IN: packet header
                    HgfsOp op,                  // IN: request type
                    size_t *payloadSize,        // OUT: size of packet excluding header
                    HgfsSessionInfo *session)   // IN: Session info
@@ -1258,7 +1258,7 @@ HgfsUnpackSearchClosePayloadV3(const HgfsRequestSearchCloseV3 *requestV3, // IN:
  */
 
 Bool
-HgfsUnpackSearchCloseRequest(void const *packet,   // IN: request packet
+HgfsUnpackSearchCloseRequest(const void *packet,   // IN: request packet
                              size_t packetSize,    // IN: request packet size
                              HgfsOp op,            // IN: request type
                              HgfsHandle *search)   // OUT: search to close
@@ -1312,7 +1312,7 @@ HgfsUnpackSearchCloseRequest(void const *packet,   // IN: request packet
 
 Bool
 HgfsPackSearchCloseReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                         void const *packetHeader,   // IN: packet header
+                         const void *packetHeader,   // IN: packet header
                          HgfsOp op,                  // IN: request type
                          size_t *payloadSize,        // OUT: size of packet
                          HgfsSessionInfo *session)   // IN: Session info
@@ -1621,7 +1621,7 @@ HgfsUnpackDeletePayloadV1(const HgfsRequestDelete *requestV1,   // IN: request p
  */
 
 Bool
-HgfsUnpackDeleteRequest(void const *packet,      // IN: HGFS packet
+HgfsUnpackDeleteRequest(const void *packet,      // IN: HGFS packet
                         size_t packetSize,       // IN: request packet size
                         HgfsOp op,               // IN: requested operation
                         const char **cpName,     // OUT: cpName
@@ -1718,7 +1718,7 @@ HgfsUnpackDeleteRequest(void const *packet,      // IN: HGFS packet
 
 Bool
 HgfsPackDeleteReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                    void const *packetHeader,  // IN: packet header
+                    const void *packetHeader,  // IN: packet header
                     HgfsOp op,                 // IN: requested operation
                     size_t *payloadSize,       // OUT: size of packet
                     HgfsSessionInfo *session)  // IN: Session info
@@ -2013,7 +2013,7 @@ HgfsUnpackRenamePayloadV1(const HgfsRequestRename *requestV1, // IN: request pay
  */
 
 Bool
-HgfsUnpackRenameRequest(void const *packet,       // IN: HGFS packet
+HgfsUnpackRenameRequest(const void *packet,       // IN: HGFS packet
                         size_t packetSize,        // IN: request packet size
                         HgfsOp op,                // IN: requested operation
                         const char **cpOldName,   // OUT: rename src
@@ -2127,7 +2127,7 @@ HgfsUnpackRenameRequest(void const *packet,       // IN: HGFS packet
 
 Bool
 HgfsPackRenameReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                    void const *packetHeader,  // IN: packet header
+                    const void *packetHeader,  // IN: packet header
                     HgfsOp op,                 // IN: requested operation
                     size_t *payloadSize,       // OUT: size of packet
                     HgfsSessionInfo *session)  // IN: Session info
@@ -2559,7 +2559,7 @@ HgfsPackGetattrReplyPayloadV1(HgfsFileAttrInfo *attr,       // IN: attr stucture
  */
 
 Bool
-HgfsUnpackGetattrRequest(void const *packet,         // IN: HGFS packet
+HgfsUnpackGetattrRequest(const void *packet,         // IN: HGFS packet
                          size_t packetSize,          // IN: request packet size
                          HgfsOp op,                  // IN request type
                          HgfsFileAttrInfo *attrInfo, // IN/OUT: getattr info
@@ -2653,7 +2653,7 @@ HgfsUnpackGetattrRequest(void const *packet,         // IN: HGFS packet
 
 Bool
 HgfsPackGetattrReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                     void const *packetHeader,   // IN: packet header
+                     const void *packetHeader,   // IN: packet header
                      HgfsFileAttrInfo *attr,     // IN: attr stucture
                      const char *utf8TargetName, // IN: optional target name
                      uint32 utf8TargetNameLen,   // IN: file name length
@@ -3554,7 +3554,7 @@ HgfsUnpackSetattrPayloadV1(const HgfsRequestSetattr *requestV1,  // IN: request
  */
 
 Bool
-HgfsUnpackSetattrRequest(void const *packet,       // IN: HGFS packet
+HgfsUnpackSetattrRequest(const void *packet,       // IN: HGFS packet
                          size_t packetSize,        // IN: request packet size
                          HgfsOp op,                // IN: request type
                          HgfsFileAttrInfo *attr,   // OUT: setattr info
@@ -3654,7 +3654,7 @@ HgfsUnpackSetattrRequest(void const *packet,       // IN: HGFS packet
 
 Bool
 HgfsPackSetattrReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                     void const *packetHeader,  // IN: packet header
+                     const void *packetHeader,  // IN: packet header
                      HgfsOp op,                 // IN: request type
                      size_t *payloadSize,       // OUT: size of packet
                      HgfsSessionInfo *session)  // IN: Session info
@@ -3876,7 +3876,7 @@ HgfsUnpackCreateDirPayloadV1(const HgfsRequestCreateDir *requestV1, // IN: reque
  */
 
 Bool
-HgfsUnpackCreateDirRequest(void const *packet,      // IN: incoming packet
+HgfsUnpackCreateDirRequest(const void *packet,      // IN: incoming packet
                            size_t packetSize,       // IN: size of packet
                            HgfsOp op,               // IN: request type
                            HgfsCreateDirInfo *info) // IN/OUT: info struct
@@ -3948,7 +3948,7 @@ HgfsUnpackCreateDirRequest(void const *packet,      // IN: incoming packet
 
 Bool
 HgfsPackCreateDirReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                       void const *packetHeader,  // IN: packet header
+                       const void *packetHeader,  // IN: packet header
                        HgfsOp op,                 // IN: request type
                        size_t *payloadSize,        // OUT: size of packet
                        HgfsSessionInfo *session)  // IN: Session info
@@ -4057,7 +4057,7 @@ HgfsUnpackWriteWin32StreamPayloadV3(const HgfsRequestWriteWin32StreamV3 *request
  */
 
 Bool
-HgfsUnpackWriteWin32StreamRequest(void const *packet, // IN: incoming packet
+HgfsUnpackWriteWin32StreamRequest(const void *packet, // IN: incoming packet
                                   size_t packetSize,  // IN: size of packet
                                   HgfsOp op,          // IN: request type
                                   HgfsHandle *file,   // OUT: file to write to
@@ -4106,7 +4106,7 @@ HgfsUnpackWriteWin32StreamRequest(void const *packet, // IN: incoming packet
 
 Bool
 HgfsPackWriteWin32StreamReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                              void const *packetHeader,  // IN: packet header
+                              const void *packetHeader,  // IN: packet header
                               HgfsOp op,                 // IN: request type
                               uint32 actualSize,         // IN: amount written
                               size_t *payloadSize,       // OUT: size of packet
@@ -4224,7 +4224,7 @@ HgfsUnpackReadPayloadV3(const HgfsRequestReadV3 *requestV3,  // IN: payload
  */
 
 Bool
-HgfsUnpackReadRequest(void const *packet,     // IN: HGFS request
+HgfsUnpackReadRequest(const void *packet,     // IN: HGFS request
                       size_t packetSize,      // IN: request packet size
                       HgfsOp  op,             // IN: request type
                       HgfsHandle *file,       // OUT: Handle to close
@@ -4405,7 +4405,7 @@ HgfsUnpackWriteFastPayloadV4(const HgfsRequestWriteV3 *requestV3, // IN: payload
  */
 
 Bool
-HgfsUnpackWriteRequest(void const *writeRequest,// IN: write request params
+HgfsUnpackWriteRequest(const void *writeRequest,// IN: write request params
                        size_t writeRequestSize, // IN: write request params size
                        HgfsOp writeOp,          // IN: request version
                        HgfsHandle *file,        // OUT: Handle to write to
@@ -4471,7 +4471,7 @@ HgfsUnpackWriteRequest(void const *writeRequest,// IN: write request params
 
 Bool
 HgfsPackWriteReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                   void const *packetHeader,     // IN: packet header
+                   const void *packetHeader,     // IN: packet header
                    HgfsOp op,                    // IN: request type
                    uint32 actualSize,            // IN: number of bytes that were written
                    size_t *payloadSize,          // OUT: size of packet
@@ -4607,7 +4607,7 @@ HgfsUnpackQueryVolumePayloadV3(const HgfsRequestQueryVolumeV3 *requestV3, // IN:
  */
 
 Bool
-HgfsUnpackQueryVolumeRequest(void const *packet,     // IN: HGFS packet
+HgfsUnpackQueryVolumeRequest(const void *packet,     // IN: HGFS packet
                              size_t packetSize,      // IN: request packet size
                              HgfsOp op,              // IN: request type
                              Bool *useHandle,        // OUT: use handle
@@ -4670,7 +4670,7 @@ HgfsUnpackQueryVolumeRequest(void const *packet,     // IN: HGFS packet
 
 Bool
 HgfsPackQueryVolumeReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                         void const *packetHeader,  // IN: packet header
+                         const void *packetHeader,  // IN: packet header
                          HgfsOp op,                 // IN: request type
                          uint64 freeBytes,          // IN: volume free space
                          uint64 totalBytes,         // IN: volume capacity
@@ -4842,7 +4842,7 @@ HgfsUnpackSymlinkCreatePayloadV3(const HgfsRequestSymlinkCreateV3 *requestV3, //
  */
 
 Bool
-HgfsUnpackSymlinkCreateRequest(void const *packet,        // IN: HGFS packet
+HgfsUnpackSymlinkCreateRequest(const void *packet,        // IN: HGFS packet
                                size_t packetSize,         // IN: request packet size
                                HgfsOp op,                 // IN: request type
                                Bool *srcUseHandle,        // OUT: use source handle
@@ -4916,7 +4916,7 @@ HgfsUnpackSymlinkCreateRequest(void const *packet,        // IN: HGFS packet
 
 Bool
 HgfsPackSymlinkCreateReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                           void const *packetHeader,  // IN: packet header
+                           const void *packetHeader,  // IN: packet header
                            HgfsOp op,                 // IN: request type
                            size_t *payloadSize,       // OUT: size of packet
                            HgfsSessionInfo *session)  // IN: Session info
@@ -5049,7 +5049,7 @@ HgfsUnpackSearchOpenPayloadV3(const HgfsRequestSearchOpenV3 *requestV3, // IN: p
  */
 
 Bool
-HgfsUnpackSearchOpenRequest(void const *packet,      // IN: HGFS packet
+HgfsUnpackSearchOpenRequest(const void *packet,      // IN: HGFS packet
                             size_t packetSize,       // IN: request packet size
                             HgfsOp op,               // IN: request type
                             const char **dirName,    // OUT: directory name
@@ -5108,7 +5108,7 @@ HgfsUnpackSearchOpenRequest(void const *packet,      // IN: HGFS packet
 
 Bool
 HgfsPackSearchOpenReply(HgfsPacket *packet,          // IN/OUT: Hgfs Packet
-                        void const *packetHeader,    // IN: packet header
+                        const void *packetHeader,    // IN: packet header
                         HgfsOp op,                   // IN: request type
                         HgfsHandle search,           // IN: search handle
                         size_t *payloadSize,         // OUT: size of packet
@@ -5210,7 +5210,7 @@ HgfsUnpackCreateSessionPayloadV4(const HgfsRequestCreateSessionV4 *requestV4, //
  */
 
 Bool
-HgfsUnpackCreateSessionRequest(void const *packet,          // IN: HGFS packet
+HgfsUnpackCreateSessionRequest(const void *packet,          // IN: HGFS packet
                                size_t packetSize,           // IN: size of packet
                                HgfsOp op,                   // IN: request type
                                HgfsCreateSessionInfo *info) // IN/OUT: info struct
@@ -5250,7 +5250,7 @@ HgfsUnpackCreateSessionRequest(void const *packet,          // IN: HGFS packet
 
 Bool
 HgfsPackCreateSessionReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                           void const *packetHeader,  // IN: packet header
+                           const void *packetHeader,  // IN: packet header
                            size_t *payloadSize,       // OUT: size of packet
                            HgfsSessionInfo *session)  // IN: Session info
 {
@@ -5293,7 +5293,7 @@ HgfsPackCreateSessionReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
 
 Bool
 HgfsPackDestroySessionReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                            void const *packetHeader,  // IN: packet header
+                            const void *packetHeader,  // IN: packet header
                             size_t *payloadSize,        // OUT: size of packet
                             HgfsSessionInfo *session)  // IN: Session info
 {
@@ -5382,7 +5382,7 @@ HgfsPackSetWatchReplyV4(HgfsSubscriberHandle watchId, // IN: host id of thee new
 
 Bool
 HgfsPackSetWatchReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                      void const *packetHeader,     // IN: packet header
+                      const void *packetHeader,     // IN: packet header
                       HgfsOp     op,                // IN: operation code
                       HgfsSubscriberHandle watchId, // IN: id of the new watch
                       size_t *payloadSize,          // OUT: size of packet
@@ -5474,7 +5474,7 @@ HgfsUnpackSetWatchPayloadV4(const HgfsRequestSetWatchV4 *requestV4, // IN: reque
  */
 
 Bool
-HgfsUnpackSetWatchRequest(void const *packet,      // IN: HGFS packet
+HgfsUnpackSetWatchRequest(const void *packet,      // IN: HGFS packet
                           size_t packetSize,       // IN: request packet size
                           HgfsOp op,               // IN: requested operation
                           Bool *useHandle,         // OUT: handle or cpName
@@ -5530,7 +5530,7 @@ HgfsUnpackSetWatchRequest(void const *packet,      // IN: HGFS packet
 
 Bool
 HgfsPackRemoveWatchReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                         void const *packetHeader,     // IN: packet header
+                         const void *packetHeader,     // IN: packet header
                          HgfsOp     op,                // IN: operation code
                          size_t *payloadSize,          // OUT: size of packet
                          HgfsSessionInfo *session)     // IN: Session info
@@ -5604,7 +5604,7 @@ HgfsUnpackRemoveWatchPayloadV4(const HgfsRequestRemoveWatchV4 *requestV4, // IN:
  */
 
 Bool
-HgfsUnpackRemoveWatchRequest(void const *packet,            // IN: HGFS packet
+HgfsUnpackRemoveWatchRequest(const void *packet,            // IN: HGFS packet
                              size_t packetSize,             // IN: request packet size
                              HgfsOp op,                     // IN: requested operation
                              HgfsSubscriberHandle *watchId) // OUT: watch Id to remove
@@ -5836,7 +5836,7 @@ HgfsUnpackOplockBreakAckPayloadV4(const HgfsReplyOplockBreakV4 *opBrkAck,  // IN
  */
 
 Bool
-HgfsUnpackOplockBreakAckReply(void const *packet,            // IN: HGFS packet
+HgfsUnpackOplockBreakAckReply(const void *packet,            // IN: HGFS packet
                               size_t packetSize,             // IN: reply packet size
                               HgfsOp op,                     // IN: operation version
                               HgfsHandle *fileId,            // OUT: file Id to remove

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerParameters.h b/open-vm-tools/lib/hgfsServer/hgfsServerParameters.h
index 57a2ab3c1b749f35d13bcf2410458a69ba46695f..bcfe8590e4a55e6b803b46fa7ce49f225393bef7 100644 (file)
--- a/open-vm-tools/lib/hgfsServer/hgfsServerParameters.h
+++ b/open-vm-tools/lib/hgfsServer/hgfsServerParameters.h
@@ -38,7 +38,7 @@
 
 
 HgfsInternalStatus
-HgfsUnpackPacketParams(void const *packet,      // IN: HGFS packet
+HgfsUnpackPacketParams(const void *packet,      // IN: HGFS packet
                        size_t packetSize,       // IN: request packet size
                        Bool *sessionEnabled,    // OUT: session enabled request
                        uint64 *sessionId,       // OUT: session Id
@@ -59,20 +59,20 @@ HgfsPackReplyHeader(HgfsInternalStatus status,    // IN: reply status
                     void *hdrPacket);             // OUT: outgoing packet header
 
 Bool
-HgfsUnpackOpenRequest(void const *packet,          // IN: incoming packet
+HgfsUnpackOpenRequest(const void *packet,          // IN: incoming packet
                       size_t packetSize,           // IN: size of packet
                       HgfsOp op,                   // IN: request type
                       HgfsFileOpenInfo *openInfo); // IN/OUT: open info struct
 
 Bool
 HgfsPackOpenReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                  void const *packetHeader,     // IN: packet header
+                  const void *packetHeader,     // IN: packet header
                   HgfsFileOpenInfo *openInfo,   // IN: open info struct
                   size_t *payloadSize,          // OUT: outgoing packet size
                   HgfsSessionInfo *session);    // IN: Session Info
 
 Bool
-HgfsUnpackGetattrRequest(void const *packetHeader,   // IN: packet header
+HgfsUnpackGetattrRequest(const void *packetHeader,   // IN: packet header
                          size_t packetSize,          // IN: request packet size
                          HgfsOp op,                  // IN: request type
                          HgfsFileAttrInfo *attrInfo, // IN/OUT: unpacked attr struct
@@ -83,7 +83,7 @@ HgfsUnpackGetattrRequest(void const *packetHeader,   // IN: packet header
                          uint32 *caseFlags);         // OUT: case-sensitivity flags
 
 Bool
-HgfsUnpackDeleteRequest(void const *packet,         // IN: request packet
+HgfsUnpackDeleteRequest(const void *packet,         // IN: request packet
                         size_t packetSize,          // IN: request packet size
                         HgfsOp  op,                 // IN: requested operation
                         const char **cpName,        // OUT: cpName
@@ -94,13 +94,13 @@ HgfsUnpackDeleteRequest(void const *packet,         // IN: request packet
 
 Bool
 HgfsPackDeleteReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                    void const *packetHeader,   // IN: packet header
+                    const void *packetHeader,   // IN: packet header
                     HgfsOp op,                  // IN: requested operation
                     size_t *payloadSize,        // OUT: size of HGFS packet
                     HgfsSessionInfo *session);  // IN: Session Info
 
 Bool
-HgfsUnpackRenameRequest(void const *packet,         // IN: request packet
+HgfsUnpackRenameRequest(const void *packet,         // IN: request packet
                         size_t packetSize,          // IN: request packet size
                         HgfsOp op,                  // IN: requested operation
                         const char **cpOldName,     // OUT: rename src
@@ -115,14 +115,14 @@ HgfsUnpackRenameRequest(void const *packet,         // IN: request packet
 
 Bool
 HgfsPackRenameReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                    void const *packetHeader,   // IN: packet header
+                    const void *packetHeader,   // IN: packet header
                     HgfsOp op,                  // IN: requested operation
                     size_t *payloadSize,        // OUT: size of packet
                     HgfsSessionInfo *session);  // IN: Session Info
 
 Bool
 HgfsPackGetattrReply(HgfsPacket *packet,          // IN/OUT: Hgfs packet
-                     void const *packetHeader,    // IN: packet header
+                     const void *packetHeader,    // IN: packet header
                      HgfsFileAttrInfo *attr,      // IN: attr stucture
                      const char *utf8TargetName,  // IN: optional target name
                      uint32 utf8TargetNameLen,    // IN: file name length
@@ -130,7 +130,7 @@ HgfsPackGetattrReply(HgfsPacket *packet,          // IN/OUT: Hgfs packet
                      HgfsSessionInfo *session);   // IN: Session Info
 Bool
 HgfsPackSymlinkCreateReply(HgfsPacket *packet,        // IN/OUT: Hgfs packet
-                           void const *packetHeader,  // IN: packet header
+                           const void *packetHeader,  // IN: packet header
                            HgfsOp op,                 // IN: request type
                            size_t *payloadSize,       // OUT: size of HGFS packet
                            HgfsSessionInfo *session); // IN: Session Info
@@ -154,7 +154,7 @@ HgfsPackSearchReadReplyHeader(HgfsSearchReadInfo *info,    // IN: request info
                               size_t *payloadSize);        // OUT: size of packet
 
 Bool
-HgfsUnpackSetattrRequest(void const *packet,            // IN: request packet
+HgfsUnpackSetattrRequest(const void *packet,            // IN: request packet
                          size_t packetSize,             // IN: request packet size
                          HgfsOp op,                     // IN: requested operation
                          HgfsFileAttrInfo *attr,        // IN/OUT: getattr info
@@ -166,34 +166,34 @@ HgfsUnpackSetattrRequest(void const *packet,            // IN: request packet
 
 Bool
 HgfsPackSetattrReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                     void const *packetHeader,   // IN: packet header
+                     const void *packetHeader,   // IN: packet header
                      HgfsOp op,                  // IN: request type
                      size_t *payloadSize,        // OUT: size of packet
                      HgfsSessionInfo *session);  // IN: Session Info
 
 Bool
-HgfsUnpackCreateDirRequest(void const *packet,       // IN: HGFS packet
+HgfsUnpackCreateDirRequest(const void *packet,       // IN: HGFS packet
                            size_t packetSize,        // IN: size of packet
                            HgfsOp op,                // IN: requested operation
                            HgfsCreateDirInfo *info); // IN/OUT: info struct
 
 Bool
 HgfsPackCreateDirReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                       void const *packetHeader,   // IN: packet header
+                       const void *packetHeader,   // IN: packet header
                        HgfsOp op,                  // IN: request type
                        size_t *payloadSize,        // OUT: size of packet
                        HgfsSessionInfo *session);  // IN: Session Info
 
 Bool
 HgfsPackQueryVolumeReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                         void const *packetHeader,  // IN: packet header
+                         const void *packetHeader,  // IN: packet header
                          HgfsOp op,                 // IN: request type
                          uint64 freeBytes,          // IN: volume free space
                          uint64 totalBytes,         // IN: volume capacity
                          size_t *payloadSize,       // OUT: size of packet
                          HgfsSessionInfo *session); // IN: Session Info
 Bool
-HgfsUnpackQueryVolumeRequest(void const *packet,     // IN: HGFS packet
+HgfsUnpackQueryVolumeRequest(const void *packet,     // IN: HGFS packet
                              size_t packetSize,      // IN: request packet size
                              HgfsOp op,              // IN: request type
                              Bool *useHandle,        // OUT: use handle
@@ -202,7 +202,7 @@ HgfsUnpackQueryVolumeRequest(void const *packet,     // IN: HGFS packet
                              uint32 *caseFlags,      // OUT: case sensitivity
                              HgfsHandle *file);      // OUT: Handle to the volume
 Bool
-HgfsUnpackSymlinkCreateRequest(void const *packet,        // IN: request packet
+HgfsUnpackSymlinkCreateRequest(const void *packet,        // IN: request packet
                                size_t packetSize,         // IN: request packet size
                                HgfsOp op,                 // IN: request type
                                Bool *srcUseHandle,        // OUT: use source handle
@@ -216,7 +216,7 @@ HgfsUnpackSymlinkCreateRequest(void const *packet,        // IN: request packet
                                uint32 *tgCaseFlags,       // OUT: target case sensitivity
                                HgfsHandle *tgFile);        // OUT: target file handle
 Bool
-HgfsUnpackWriteWin32StreamRequest(void const *packet,   // IN: HGFS packet
+HgfsUnpackWriteWin32StreamRequest(const void *packet,   // IN: HGFS packet
                                   size_t packetSize,    // IN: size of packet
                                   HgfsOp op,            // IN: request type
                                   HgfsHandle *file,     // OUT: file to write to
@@ -224,25 +224,25 @@ HgfsUnpackWriteWin32StreamRequest(void const *packet,   // IN: HGFS packet
                                   size_t *requiredSize, // OUT: size of data
                                   Bool *doSecurity);    // OUT: restore sec.str.
 Bool
-HgfsUnpackCreateSessionRequest(void const *packetHeader,     // IN: request packet
+HgfsUnpackCreateSessionRequest(const void *packetHeader,     // IN: request packet
                                size_t packetSize,            // IN: size of packet
                                HgfsOp op,                    // IN: request type
                                HgfsCreateSessionInfo *info); // IN/OUT: info struct
 Bool
 HgfsPackWriteWin32StreamReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                              void const *packetHeader,   // IN: packet headert
+                              const void *packetHeader,   // IN: packet headert
                               HgfsOp op,                  // IN: request type
                               uint32 actualSize,          // IN: amount written
                               size_t *payloadSize,        // OUT: size of packet
                               HgfsSessionInfo *session);  // IN:Session Info
 
 Bool
-HgfsUnpackCloseRequest(void const *packet,    // IN: request packet
+HgfsUnpackCloseRequest(const void *packet,    // IN: request packet
                        size_t packetSize,     // IN: request packet size
                        HgfsOp op,             // IN: request type
                        HgfsHandle *file);     // OUT: Handle to close
 Bool
-HgfsUnpackSearchOpenRequest(void const *packet,      // IN: HGFS packet
+HgfsUnpackSearchOpenRequest(const void *packet,      // IN: HGFS packet
                             size_t packetSize,       // IN: request packet size
                             HgfsOp op,               // IN: request type
                             const char **dirName,    // OUT: directory name
@@ -250,45 +250,45 @@ HgfsUnpackSearchOpenRequest(void const *packet,      // IN: HGFS packet
                             uint32 *caseFlags);      // OUT: case flags
 Bool
 HgfsPackCloseReply(HgfsPacket *packet,          // IN/OUT: Hgfs Packet
-                   void const *packetHeader,    // IN: packet header
+                   const void *packetHeader,    // IN: packet header
                    HgfsOp op,                   // IN: request type
                    size_t *payloadSize,         // OUT: size of packet
                    HgfsSessionInfo *session);   // IN: Session Info
 
 Bool
-HgfsUnpackSearchCloseRequest(void const *packet,    // IN: request packet
+HgfsUnpackSearchCloseRequest(const void *packet,    // IN: request packet
                              size_t packetSize,     // IN: request packet size
                              HgfsOp op,             // IN: request type
                              HgfsHandle *file);     // OUT: Handle to close
 Bool
 HgfsPackSearchOpenReply(HgfsPacket *packet,          // IN/OUT: Hgfs Packet
-                        void const *packetHeader,    // IN: packet header
+                        const void *packetHeader,    // IN: packet header
                         HgfsOp op,                   // IN: request type
                         HgfsHandle search,           // IN: search handle
                         size_t *packetSize,          // OUT: size of packet
                         HgfsSessionInfo *session);   // IN: Session Info
 Bool
 HgfsPackSearchCloseReply(HgfsPacket *packet,         // IN/OUT: Hgfs Packet
-                         void const *packetHeader,   // IN: packet header
+                         const void *packetHeader,   // IN: packet header
                          HgfsOp op,                  // IN: request type
                          size_t *packetSize,         // OUT: size of packet
                          HgfsSessionInfo *session);  // IN: Session Info
 Bool
 HgfsPackWriteReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                   void const *packetHeader,     // IN: packet header
+                   const void *packetHeader,     // IN: packet header
                    HgfsOp op,                    // IN: request type
                    uint32 actualSize,            // IN: number of bytes that were written
                    size_t *payloadSize,          // OUT: size of packet
                    HgfsSessionInfo *session);    // IN: Session info
 Bool
-HgfsUnpackReadRequest(void const *packet,     // IN: HGFS request
+HgfsUnpackReadRequest(const void *packet,     // IN: HGFS request
                       size_t packetSize,      // IN: request packet size
                       HgfsOp  op,             // IN: request type
                       HgfsHandle *file,       // OUT: Handle to close
                       uint64 *offset,         // OUT: offset to read from
                       uint32 *length);        // OUT: length of data to read
 Bool
-HgfsUnpackWriteRequest(void const *writeRequest,// IN: HGFS write request params
+HgfsUnpackWriteRequest(const void *writeRequest,// IN: HGFS write request params
                        size_t writeRequestSize, // IN: write request params size
                        HgfsOp writeOp,          // IN: request version
                        HgfsHandle *file,        // OUT: Handle to write to
@@ -298,19 +298,19 @@ HgfsUnpackWriteRequest(void const *writeRequest,// IN: HGFS write request params
                        const void **data);      // OUT: data to be written
 Bool
 HgfsPackCreateSessionReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                           void const *packetHeader,  // IN: packet header
+                           const void *packetHeader,  // IN: packet header
                            size_t *payloadSize,       // OUT: size of packet
                            HgfsSessionInfo *session); // IN: Session Info
 Bool
 HgfsPackDestroySessionReply(HgfsPacket *packet,        // IN/OUT: Hgfs Packet
-                            void const *packetHeader,  // IN: packet header
+                            const void *packetHeader,  // IN: packet header
                             size_t *payloadSize,       // OUT: size of packet
                             HgfsSessionInfo *session); // IN: Session Info
 void
 HgfsServerGetDefaultCapabilities(HgfsCapability *capabilities,   // OUT:
                                  uint32 *numberOfCapabilities);  // OUT:
 Bool
-HgfsUnpackSetWatchRequest(void const *packet,      // IN: HGFS packet
+HgfsUnpackSetWatchRequest(const void *packet,      // IN: HGFS packet
                           size_t packetSize,       // IN: request packet size
                           HgfsOp op,               // IN: requested operation
                           Bool *useHandle,         // OUT: handle or cpName
@@ -322,19 +322,19 @@ HgfsUnpackSetWatchRequest(void const *packet,      // IN: HGFS packet
                           uint32 *caseFlags);      // OUT: case-sensitivity flags
 Bool
 HgfsPackSetWatchReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                      void const *packetHeader,     // IN: packet header
+                      const void *packetHeader,     // IN: packet header
                       HgfsOp     op,                // IN: operation code
                       HgfsSubscriberHandle watchId, // IN: new watch id
                       size_t *payloadSize,          // OUT: size of packet
                       HgfsSessionInfo *session);    // IN: Session info
 Bool
-HgfsUnpackRemoveWatchRequest(void const *packet,             // IN: HGFS packet
+HgfsUnpackRemoveWatchRequest(const void *packet,             // IN: HGFS packet
                              size_t packetSize,              // IN: packet size
                              HgfsOp op,                      // IN: operation code
                              HgfsSubscriberHandle *watchId); // OUT: watch Id
 Bool
 HgfsPackRemoveWatchReply(HgfsPacket *packet,           // IN/OUT: Hgfs Packet
-                         void const *packetHeader,     // IN: packet header
+                         const void *packetHeader,     // IN: packet header
                          HgfsOp     op,                // IN: operation code
                          size_t *payloadSize,          // OUT: size of packet
                          HgfsSessionInfo *session);    // IN: Session info