Changeset 63275 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Aug 10, 2016 2:24:44 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109908

Message:

NetworkServices: warnings

Location:

trunk/src/VBox/NetworkServices

Files:

• NAT/proxy_pollmgr.c (modified) (6 diffs)
• NetLib/ComHostUtils.cpp (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/proxy_pollmgr.c

@@ -91 +91 @@
 
     for (i = 0; i < POLLMGR_SLOT_STATIC_COUNT; ++i) {
-        pollmgr.chan[i][POLLMGR_CHFD_RD] = -1;
-        pollmgr.chan[i][POLLMGR_CHFD_WR] = -1;
+        pollmgr.chan[i][POLLMGR_CHFD_RD] = INVALID_SOCKET;
+        pollmgr.chan[i][POLLMGR_CHFD_WR] = INVALID_SOCKET;
     }
 
@@ -146 +146 @@
     for (i = 0; i < POLLMGR_SLOT_STATIC_COUNT; ++i) {
         SOCKET *chan = pollmgr.chan[i];
-        if (chan[POLLMGR_CHFD_RD] >= 0) {
+        if (chan[POLLMGR_CHFD_RD] != INVALID_SOCKET) {
             closesocket(chan[POLLMGR_CHFD_RD]);
             closesocket(chan[POLLMGR_CHFD_WR]);
@@ -164 +164 @@
     if (slot >= POLLMGR_SLOT_FIRST_DYNAMIC) {
         handler->slot = -1;
-        return -1;
+        return INVALID_SOCKET;
     }
 
@@ -276 +276 @@
     void *ptr;
     ssize_t nread;
+    NOREF(handler);
 
     if (revents & POLLNVAL) {
@@ -403 +404 @@
 
             if (handler != NULL && handler->callback != NULL) {
-#if LWIP_PROXY_DEBUG /* DEBUG */
+#ifdef LWIP_PROXY_DEBUG
+# if LWIP_PROXY_DEBUG /* DEBUG */
                 if (i < POLLMGR_SLOT_FIRST_DYNAMIC) {
                     if (revents == POLLIN) {
@@ -417 +419 @@
                               __func__, fd, revents));
                 }
-#endif /* DEBUG */
+# endif /* LWIP_PROXY_DEBUG / DEBUG */
+#endif
                 nevents = (*handler->callback)(handler, fd, revents);
             }

trunk/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef RT_OS_WINDOWS
+#if defined(RT_OS_WINDOWS) && !defined(VBOX_COM_OUTOFPROC_MODULE)
 # define VBOX_COM_OUTOFPROC_MODULE
 #endif