Changeset 15209 in vbox for trunk/src

Timestamp:

Dec 9, 2008 10:15:20 PM (16 years ago)

Author:

vboxsync

Message:

slirp: do {} while (0), cosmetics

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (3 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -34 +34 @@
     } while (0)
 # else /* !VBOX_WITH_SLIRP_ICMP */
-#  define ICMP_ENGAGE_EVENT(so, fdset1, fdset2)      \
-    /* no ICMP socket */
+#  define ICMP_ENGAGE_EVENT(so, fdset1, fdset2)      do {} while (0)
 # endif /* !VBOX_WITH_SLIRP_ICMP */
 
@@ -44 +43 @@
  * So no call to WSAEventSelect necessary.
  */
-# define ICMP_ENGAGE_EVENT(so, fdset1, fdset2) \
-    /* ignore */
-
-# define DO_ENGAGE_EVENT1(so, fdset1, label)                                                    \
-    do {                                                                                        \
-        rc = WSAEventSelect((so)->s, VBOX_SOCKET_EVENT, FD_ALL_EVENTS);                         \
-        if (rc == SOCKET_ERROR)                                                                 \
-        {                                                                                       \
-            /* This should not happen */                                                        \
-            error = WSAGetLastError();                                                          \
-            LogRel(("WSAEventSelector (" #label ") error %d (so=%x, socket=%s, event=%x)\n",    \
-                        error, (so), (so)->s, VBOX_SOCKET_EVENT));                              \
-        }                                                                                       \
+# define ICMP_ENGAGE_EVENT(so, fdset1, fdset2)       do {} while(0)
+
+# define DO_ENGAGE_EVENT1(so, fdset1, label)         \
+    do {                                             \
+        rc = WSAEventSelect((so)->s, VBOX_SOCKET_EVENT, FD_ALL_EVENTS); \
+        if (rc == SOCKET_ERROR)                      \
+        {                                            \
+            /* This should not happen */             \
+            error = WSAGetLastError();               \
+            LogRel(("WSAEventSelector (" #label ") error %d (so=%x, socket=%s, event=%x)\n", \
+                        error, (so), (so)->s, VBOX_SOCKET_EVENT)); \
+        }                                            \
     } while(0)
 
@@ -73 +71 @@
     DO_ENGAGE_EVENT1((so), (fdset), UDP)
 
-static const uint8_t special_ethaddr[6] = {
+static const uint8_t special_ethaddr[6] =
+{
     0x52, 0x54, 0x00, 0x12, 0x35, 0x00
 };