[PATCH] wnaspi32: call ASPI_GetNumControllers() only once (more readable traces). Also, degrade ERR to WARN.
Rok Mandeljc
rok.mandeljc at email.si
Thu Nov 1 02:08:13 CDT 2007
---
dlls/wnaspi32/winaspi32.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c
index e06bb9b..faf266c 100644
--- a/dlls/wnaspi32/winaspi32.c
+++ b/dlls/wnaspi32/winaspi32.c
@@ -308,6 +308,7 @@ ASPI_ExecScsiCmd(SRB_ExecSCSICmd *lpPRB)
WORD ret;
DWORD status;
int in_len, out_len;
+ int num_controllers = 0;
int error_code = 0;
int fd;
DWORD SRB_Status;
@@ -343,9 +344,11 @@ ASPI_ExecScsiCmd(SRB_ExecSCSICmd *lpPRB)
break;
}
ASPI_DebugPrintCmd(lpPRB);
- if (lpPRB->SRB_HaId > ASPI_GetNumControllers()) {
- ERR("Failed: Wanted hostadapter %d, but we have only %d.\n",
- lpPRB->SRB_HaId,ASPI_GetNumControllers()
+
+ num_controllers = ASPI_GetNumControllers();
+ if (lpPRB->SRB_HaId > num_controllers) {
+ WARN("Failed: Wanted hostadapter %d, but we have only %d.\n",
+ lpPRB->SRB_HaId, num_controllers
);
return WNASPI32_DoPosting( lpPRB, SS_INVALID_HA );
}
--
1.5.3.3
--------------070602000601000701000109--
More information about the wine-patches
mailing list