From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 21 Apr 2020 21:43:45 +0000 (-0700)
Subject: Common source file changes not applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1a02b45838f568d8a70d22f16e28bd2da8c447e;p=thirdparty%2Fopen-vm-tools.git

Common source file changes not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/poll/poll.c b/open-vm-tools/lib/poll/poll.c
index fd5ce4b18..4ddd8637e 100644
--- a/open-vm-tools/lib/poll/poll.c
+++ b/open-vm-tools/lib/poll/poll.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -2056,7 +2056,7 @@ PollUnitTest_StateMachine(void *clientData) // IN: Unused
                     __FUNCTION__, i);
             break;
          }
-         send(socketPairs[i].fds[0], (const char *)fds, sizeof fds, 0);
+         retval = send(socketPairs[i].fds[0], (const char *)fds, sizeof fds, 0);
 #else
          int addrFamily = useVMCI ? VMCISock_GetAFValue(): AF_UNIX;
          socketPairs[i].fds[0] = -1;
@@ -2134,7 +2134,7 @@ PollUnitTest_StateMachine(void *clientData) // IN: Unused
             state ++;
             break;
          }
-         send(fds[0], (const char *)fds, sizeof fds, 0);
+         retval = send(fds[0], (const char *)fds, sizeof fds, 0);
    #else
          close(fds[0]);
          close(fds[1]);
@@ -2177,7 +2177,7 @@ PollUnitTest_StateMachine(void *clientData) // IN: Unused
             state += 3;
             break;
          }
-         send(fds[0], (const char *)fds, sizeof fds, 0);
+         retval = send(fds[0], (const char *)fds, sizeof fds, 0);
    #endif
          state = 0;
          break;
@@ -2217,7 +2217,7 @@ PollUnitTest_StateMachine(void *clientData) // IN: Unused
 
       /* Make fds[1] both readable and writable. */
    #ifdef _WIN32
-      send(fds[0], (const char *)fds, sizeof fds, 0);
+      retval = send(fds[0], (const char *)fds, sizeof fds, 0);
    #else
       retval = write(fds[0], fds, 1);
    #endif