Changeset 44763 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Feb 20, 2013 1:32:42 PM (12 years ago)

Author:

vboxsync

Message:

WINNT/VBoxTray/VBoxDispIf: No need to be extra cautious while checking for null pointer. One check is sufficient.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp

@@ -1384 +1384 @@
     {
         LogFlow(("VBoxTray: (WDDM) Failed QueryDisplayConfig \n"));
-        if (pPathInfoArray)
-            free(pPathInfoArray);
-        if (pModeInfoArray)
-            free(pModeInfoArray);
+        free(pPathInfoArray);
+        free(pModeInfoArray);
         return dwStatus;
     }
@@ -1412 +1410 @@
     if (dwStatus != ERROR_SUCCESS)
     {
-        if (pPathInfoArray)
-            free(pPathInfoArray);
-        if (pModeInfoArray)
-            free(pModeInfoArray);
+        free(pPathInfoArray);
+        free(pModeInfoArray);
         LogRel(("VBoxTray:(WDDM) Failed to Enable/ disable the monitor."));
         return dwStatus;
     }
-    if (pPathInfoArray)
-        free(pPathInfoArray);
-    if (pModeInfoArray)
-        free(pModeInfoArray);
+    free(pPathInfoArray);
+    free(pModeInfoArray);
     return ERROR_SUCCESS;
 }
@@ -1456 +1450 @@
     {
         LogFlow(("VBoxTray: (WDDM) Failed QueryDisplayConfig \n"));
-        if (pPathInfoArray)
-            free(pPathInfoArray);
-        if (pModeInfoArray)
-            free(pModeInfoArray);
+        free(pPathInfoArray);
+        free(pModeInfoArray);
         return dwStatus;
      }
@@ -1479 +1471 @@
     if (dwStatus != ERROR_SUCCESS)
     {
-        if (pPathInfoArray)
-            free(pPathInfoArray);
-        if (pModeInfoArray)
-            free(pModeInfoArray);
+        free(pPathInfoArray);
+        free(pModeInfoArray);
         LogRel(("VBoxTray:(WDDM) Failed to Enable/ disable the monitor."));
         return dwStatus;
     }
-    if (pPathInfoArray)
-        free(pPathInfoArray);
-    if (pModeInfoArray)
-        free(pModeInfoArray);
+    free(pPathInfoArray);
+    free(pModeInfoArray);
     return ERROR_SUCCESS;
 }