Changeset 31097 in vbox

Timestamp:

Jul 26, 2010 8:59:43 AM (15 years ago)

Author:

vboxsync

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

64049

Message:

RT_LIKELY misusage

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (2 diffs)
• slirp/slirp_state.h (modified) (6 diffs)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -1580 +1580 @@
 {
 #ifdef DEBUG
-    if (RT_LIKELY(e1kCsEnter(pState, VERR_SEM_BUSY)) == VINF_SUCCESS)
+    if (RT_LIKELY(e1kCsEnter(pState, VERR_SEM_BUSY) == VINF_SUCCESS))
     {
         E1kLog(("%s --- %s packet #%d: ---\n",
@@ -1588 +1588 @@
     }
 #else
-    if (RT_LIKELY(e1kCsEnter(pState, VERR_SEM_BUSY)) == VINF_SUCCESS)
+    if (RT_LIKELY(e1kCsEnter(pState, VERR_SEM_BUSY) == VINF_SUCCESS))
     {
         E1kLogRel(("E1000: %s packet #%d, seq=%x ack=%x\n", cszText, pState->u32PktNo++, ntohl(*(uint32_t*)(cpPacket+0x26)), ntohl(*(uint32_t*)(cpPacket+0x2A))));

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -469 +469 @@
         rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /*cMillies*/,    \
                            (PFNRT)tcp_output 2, data, sotcb);           \
-        if (RT_LIKELY(rc) == VERR_TIMEOUT)                              \
+        if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
             SOCKET_UNLOCK(so);                                          \
@@ -496 +496 @@
         rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /*cMillies*/,    \
                            (PFNRT)tcp_connect, 2, data, so);            \
-        if (RT_LIKELY(rc) == VERR_TIMEOUT)                              \
+        if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
             SOCKET_UNLOCK(so);                                          \
@@ -515 +515 @@
                            (PFNRT)soread_queue, 4,                      \
                            data, so, ifclose, &(ret));                  \
-        if (RT_LIKELY(rc) == VERR_TIMEOUT)                              \
+        if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
             SOCKET_UNLOCK(so);                                          \
@@ -533 +533 @@
         rc = RTReqCall((data)->pReqQueue, &pReq, 0 /*cMillies*/,        \
                        (PFNRT)sowrite, 2, data, so);                    \
-        if (RT_LIKELY(rc) == VERR_TIMEOUT)                              \
+        if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
             SOCKET_UNLOCK(so);                                          \
@@ -551 +551 @@
         rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /*cMillies */,   \
                            (PFNRT)sorecvfrom, 2, data, so);             \
-        if (RT_LIKELY(rc) == VERR_TIMEOUT)                              \
+        if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
             SOCKET_UNLOCK(so);                                          \
@@ -569 +569 @@
         rc = RTReqCallVoid((data)->pReqQueue, &pReq, 0 /* cMillies*/,   \
                            (PFNRT)udp_detach, 2, data, so);             \
-        if (RT_LIKELY(rc) == VERR_TIMEOUT)                              \
+        if (RT_LIKELY(rc == VERR_TIMEOUT))                              \
         {                                                               \
             SOCKET_UNLOCK(so);                                          \