Changeset 28396 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 16, 2010 7:37:03 AM (15 years ago)

Author:

vboxsync

Message:

DrvNAT: minor cleanup

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (6 diffs)

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

@@ -206 +206 @@
 typedef DRVNAT *PDRVNAT;
 
-/**
- * NAT queue item.
- */
-typedef struct DRVNATQUEUITEM
-{
-    /** The core part owned by the queue manager. */
-    PDMQUEUEITEMCORE    Core;
-    /** The buffer for output to guest. */
-    const uint8_t       *pu8Buf;
-    /* size of buffer */
-    size_t              cb;
-    void                *mbuf;
-} DRVNATQUEUITEM;
-/** Pointer to a NAT queue item. */
-typedef DRVNATQUEUITEM *PDRVNATQUEUITEM;
-
 
 /*******************************************************************************
@@ -227 +211 @@
 *******************************************************************************/
 static void drvNATNotifyNATThread(PDRVNAT pThis, const char *pszWho);
-
 
 
@@ -295 +278 @@
         AssertRC(rc);
     }
-    else if (   RT_FAILURE(rc)
-             && (  rc == VERR_TIMEOUT
-                && rc == VERR_INTERRUPTED))
+    else if (   rc != VERR_TIMEOUT
+             && rc != VERR_INTERRUPTED)
     {
         AssertRC(rc);
@@ -342 +324 @@
         AssertRC(rc);
     }
-    else if (   RT_FAILURE(rc)
-             && rc != VERR_TIMEOUT
+    else if (   rc != VERR_TIMEOUT
              && rc != VERR_INTERRUPTED)
     {
@@ -968 +949 @@
 static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pThis, PCFGMNODE pCfg, RTIPV4ADDR Network)
 {
-     RTMAC Mac;
-     memset(&Mac, 0, sizeof(RTMAC)); /*can't get MAC here */
+    RTMAC Mac;
+    RT_ZERO(Mac); /* can't get MAC here */
+
     /*
      * Enumerate redirections.
@@ -1240 +1222 @@
                 return rc;
             }
-
 
             rc = RTReqCreateQueue(&pThis->pRecvReqQueue);