Changeset 4260 for trunk/src/wnaspi32/winaspi32.cpp

Timestamp:

Sep 14, 2000, 9:09:17 PM (25 years ago)

Author:

sandervl

Message:

bugfixes

File:

• trunk/src/wnaspi32/winaspi32.cpp (modified) (8 diffs)

trunk/src/wnaspi32/winaspi32.cpp

@@ -1 @@
-/* $Id: winaspi32.cpp,v 1.7 2000-09-13 21:00:51 sandervl Exp $ */
+/* $Id: winaspi32.cpp,v 1.8 2000-09-14 19:09:17 sandervl Exp $ */
 /*
  * WNASPI routines
@@ -263 +263 @@
   bNumDrv = 0;
 
-  aspi= new scsiObj();
+  aspi = new scsiObj();
 
   if( fGainDrvAccess( FALSE, &hmtxDriver) ) // Do nonblocking call for info
@@ -287 +287 @@
           RegCloseKey( hkeyDrvInfo);
         }
-
-      aspi->close();
-      delete aspi;
+        aspi->close();
     }
     else
@@ -326 +324 @@
     }
   }
+  delete aspi;
 
   return ((brc << 8) | bNumDrv); /* FIXME: get # of host adapters installed */
@@ -347 +346 @@
     dprintf(("SendASPI32Command %x %d", lpSRB, lpSRB->common.SRB_Cmd));
 
-    aspi = new scsiObj();
-
     // test first for a valid command
     if( (SC_HA_INQUIRY!=lpSRB->common.SRB_Cmd) &&
@@ -359 +356 @@
         return SS_INVALID_SRB; // shoud be invalid command
     }
+
+    aspi = new scsiObj();
 
     dwRC = SS_ERR;
@@ -424 +423 @@
 
       fReleaseDrvAccess( hmtxDriver);
+      aspi->close();
     }
     else
@@ -429 +429 @@
       dwRC = SS_NO_ASPI;
     }
-    aspi->close();
     delete aspi;