[ros-diffs] [cgutman] 53689: [WS2_32_NEW] - Fix an error found by PVS Studio [RAMDISK] - Fix an error found by PVS Studio

Author: cgutman
Date: Sun Sep 11 15:17:48 2011
New Revision: 53689

URL: http://svn.reactos.org/svn/reactos?rev=53689&view=rev
Log:
[WS2_32_NEW]
 - Fix an error found by PVS Studio
[RAMDISK]
- Fix an error found by PVS Studio

Modified:
    trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c
    trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c

Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Sun Sep 11 15:17:48
2011
@@ -53,8 +53,8 @@
 
                 /* Check if error code was due to the host not being found */
                 if ((Status == SOCKET_ERROR) &&
-                    (ErrorCode == WSAEHOSTUNREACH) &&
-                    (ErrorCode == WSAENETUNREACH))
+                    ((ErrorCode == WSAEHOSTUNREACH) ||
+                     (ErrorCode == WSAENETUNREACH)))
                 {
                     /* Check if we can try again */
                     if (TryAgain)

Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd…
==============================================================================
--- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Sep 11 15:17:48
2011
@@ -1953,7 +1953,7 @@
         //
         // Only remove-device and query-id are allowed
         //
-        if ((Minor != IRP_MN_REMOVE_DEVICE) || (Minor != IRP_MN_QUERY_ID))
+        if ((Minor != IRP_MN_REMOVE_DEVICE) && (Minor != IRP_MN_QUERY_ID))
         {
             //
             // Fail anything else