From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:19:06 +0000 (-0700)
Subject: HGFS: Clean up server packet abstraction part VIII
X-Git-Tag: 2013.09.16-1328054~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e6615de5c2f12ff5b1bb7b6ac47c50312fd1d15;p=thirdparty%2Fopen-vm-tools.git

HGFS: Clean up server packet abstraction part VIII

Simply make the pointer checks more consistent.

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

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerPacketUtil.c b/open-vm-tools/lib/hgfsServer/hgfsServerPacketUtil.c
index 789933650..7a3ad2e19 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServerPacketUtil.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServerPacketUtil.c
@@ -95,7 +95,7 @@ HSPU_GetReplyPacket(HgfsPacket *packet,                  // IN/OUT: Hgfs Packet
                     size_t *replyPacketSize,             // IN/OUT: Size of reply Packet
                     HgfsServerChannelCallbacks *chanCb)  // IN: Channel callbacks
 {
-   if (packet->replyPacket) {
+   if (packet->replyPacket != NULL) {
       /*
        * When we are transferring packets over backdoor, reply packet
        * is a static buffer. Backdoor should always return from here.
@@ -105,8 +105,8 @@ HSPU_GetReplyPacket(HgfsPacket *packet,                  // IN/OUT: Hgfs Packet
       ASSERT_DEVEL(*replyPacketSize <= packet->replyPacketSize);
    } else if (chanCb != NULL && chanCb->getWriteVa != NULL) {
      /* Can we write directly into guest memory? */
-      ASSERT_DEVEL(packet->metaPacket);
-      if (packet->metaPacket) {
+      ASSERT_DEVEL(packet->metaPacket != NULL);
+      if (packet->metaPacket != NULL) {
          /* Use the pre-allocated metapacket buffer for the reply. */
          LOG(10, ("%s Using meta packet for reply packet\n", __FUNCTION__));
          ASSERT_DEVEL(*replyPacketSize <= packet->metaPacketSize);
@@ -188,7 +188,7 @@ HSPU_GetMetaPacket(HgfsPacket *packet,                   // IN/OUT: Hgfs Packet
       return packet->metaPacket;
    }
 
-   if (0 == packet->metaPacketSize) {
+   if (packet->metaPacketSize == 0) {
       return NULL;
    }
 
@@ -227,11 +227,11 @@ HSPU_GetDataPacketBuf(HgfsPacket *packet,                   // IN/OUT: Hgfs Pack
                       MappingType mappingType,              // IN: Writeable/Readable
                       HgfsServerChannelCallbacks *chanCb)   // IN: Channel callbacks
 {
-   if (packet->dataPacket) {
+   if (packet->dataPacket != NULL) {
       return packet->dataPacket;
    }
 
-   if (0 == packet->dataPacketSize) {
+   if (packet->dataPacketSize == 0) {
       return NULL;
    }
 
@@ -279,7 +279,7 @@ HSPUGetBuf(HgfsServerChannelCallbacks *chanCb,  // IN: Channel callbacks
    HgfsChannelMapVirtAddrFunc mapVa;
    Bool releaseMappings = FALSE;
 
-   ASSERT(buf);
+   ASSERT(buf != NULL);
 
    *buf = NULL;
    *isAllocated = FALSE;
@@ -512,7 +512,7 @@ HSPUCopyBufToIovec(HgfsVmxIov *iov,          // IN: iovs (array of mappings)
    size_t remainingSize;
    size_t copiedAmount = 0;
 
-   ASSERT(buf);
+   ASSERT(buf != NULL);
 
    for (iovIndex = startIndex,  endIndex = startIndex + iovCount, remainingSize = bufSize;
         iovIndex < endIndex && remainingSize > 0;