Changeset 5701 in vbox for trunk/src/VBox/Devices/Network/DrvTAP.cpp

Timestamp:

Nov 12, 2007 10:32:04 AM (17 years ago)

Author:

vboxsync

Message:

r=bird

File:

• trunk/src/VBox/Devices/Network/DrvTAP.cpp (modified) (12 diffs)

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

@@ -170 +170 @@
 
 /*******************************************************************************
-*   Internal Functions & Globals                                               *
+*   Internal Functions                                                         *
 *******************************************************************************/
 #ifdef RT_OS_SOLARIS
@@ -325 +325 @@
             size_t cbRead = 0;
 #ifdef VBOX_WITH_CROSSBOW
-            rc = VINF_SUCCESS;
             cbRead = sizeof(achBuf);
-            int rc2 = dlpi_recv(pData->pDeviceHandle, NULL, NULL, achBuf, &cbRead, -1, NULL);
-            if (rc2 != DLPI_SUCCESS)
-                rc = SolarisDLPIErr2VBoxErr(rc2);
+            rc = dlpi_recv(pData->pDeviceHandle, NULL, NULL, achBuf, &cbRead, -1, NULL);
+            rc = RT_LIKELY(rc == DLPI_SUCCESS) ? VINF_SUCCESS : SolarisDLPIErr2VBoxErr(rc);
 #else
             rc = RTFileRead(pData->FileDevice, achBuf, sizeof(achBuf), &cbRead);
@@ -465 +463 @@
                 size_t      cbRead = 0;
 #ifdef VBOX_WITH_CROSSBOW
-                int rc = VINF_SUCCESS;
                 cbRead = sizeof(achBuf);
-                int rc2 = dlpi_recv(pData->pDeviceHandle, NULL, NULL, achBuf, &cbRead, -1, NULL);
-                if (rc2 != DLPI_SUCCESS)
-                    rc = SolarisDLPIErr2VBoxErr(rc2);
+                int rc = dlpi_recv(pData->pDeviceHandle, NULL, NULL, achBuf, &cbRead, -1, NULL);
+                rc = RT_LIKELY(rc == DLPI_SUCCESS) ? VINF_SUCCESS : SolarisDLPIErr2VBoxErr(rc);
 #else
                 int rc = RTFileRead(pData->FileDevice, achBuf, RT_MIN(sizeof(achBuf), cbMax), &cbRead);
@@ -527 +523 @@
         if (RT_SUCCESS(rc))
         {
-            if (Status.iStatus == 0 && Status.enmReason == RTPROCEXITREASON_NORMAL)
+            if (    Status.iStatus == 0
+                &&  Status.enmReason == RTPROCEXITREASON_NORMAL)
                 return VINF_SUCCESS;
-            
+
             LogRel(("TAP#%d: Error running TAP setup application: %s\n", pData->pDrvIns->iInstance, pData->pszSetupApplication));
-            return VERR_HOSTIF_INIT_FAILED;
         }
         else
-        {
             LogRel(("TAP#%d: RTProcWait failed for: %s\n", pData->pDrvIns->iInstance, pData->pszSetupApplication));
-            return VERR_HOSTIF_INIT_FAILED;
-        }
     }
     else
@@ -545 +538 @@
               pData->pszSetupApplication, strerror(errno)));
     }
-    
-    return VERR_HOSTIF_INIT_FAILED;    
+
+    return VERR_HOSTIF_INIT_FAILED;
 }
 
@@ -572 +565 @@
         if (RT_SUCCESS(rc))
         {
-            if (Status.iStatus == 0 && Status.enmReason == RTPROCEXITREASON_NORMAL)
+            if (    Status.iStatus == 0
+                &&  Status.enmReason == RTPROCEXITREASON_NORMAL)
                 return VINF_SUCCESS;
-            
+
             LogRel(("TAP#%d: Error running TAP terminate application: %s\n", pData->pDrvIns->iInstance, pData->pszTerminateApplication));
-            return VERR_HOSTIF_TERM_FAILED;
         }
         else
-        {
             LogRel(("TAP#%d: RTProcWait failed for: %s\n", pData->pDrvIns->iInstance, pData->pszTerminateApplication));
-            return VERR_HOSTIF_INIT_FAILED;
-        }
     }
     else
@@ -590 +580 @@
               pData->pszTerminateApplication, strerror(errno)));
     }
-    return VERR_HOSTIF_TERM_FAILED;    
+    return VERR_HOSTIF_TERM_FAILED;
 }
 
@@ -659 +649 @@
         return PDMDrvHlpVMSetError(pData->pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
                            N_("dladm_vnic_create() failed. NIC %s probably incorrect."), szNICName);
-    
+
     pData->pszDeviceNameActual = NULL;
     RTStrAPrintf(&pData->pszDeviceNameActual, "vnic%u", VnicID);
@@ -742 +732 @@
                 rc = VERR_HOSTIF_INIT_FAILED;
             }
-            free(pBuf);
+            RTMemFree(pBuf);
         }
         else
@@ -855 +845 @@
         case DLPI_EINHANDLE:        return VERR_INVALID_HANDLE;
         case DLPI_ETIMEDOUT:        return VERR_TIMEOUT;
-        case DLPI_FAILURE:          return VERR_GENERAL_FAILURE;        
+        case DLPI_FAILURE:          return VERR_GENERAL_FAILURE;
 
         case DLPI_EVERNOTSUP:
@@ -871 +861 @@
     }
 
-    AssertMsgFailed(("SolarisDLPIErr2VBoxErr: Unhandled error %d\n", rc));    
+    AssertMsgFailed(("SolarisDLPIErr2VBoxErr: Unhandled error %d\n", rc));
     return VERR_UNRESOLVED_ERROR;
 }
@@ -1119 +1109 @@
 
 #ifdef RT_OS_SOLARIS
+    /** @todo r=bird: This *does* need checking against ConsoleImpl2.cpp if used on non-solaris systems. */
     if (pData->FileDevice != NIL_RTFILE)
     {