From e688e1c1c493679a84f12f803b98cf43c2d6a23b Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 9 Aug 2018 20:59:38 +0200 Subject: [PATCH] wnaspi32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc Signed-off-by: Alexandre Julliard --- dlls/wnaspi32/aspi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index e03b767979a..df052ff2fcd 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -130,7 +130,7 @@ int ASPI_GetNumControllers(void) ERR("Could not open HKLM\\%s\n", debugstr_w(wDevicemapScsi)); return 0; } - while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)/sizeof(wPortName[0])) == ERROR_SUCCESS) + while (RegEnumKeyW(hkeyScsi, i++, wPortName, ARRAY_SIZE(wPortName)) == ERROR_SUCCESS) { if (RegOpenKeyExW(hkeyScsi, wPortName, 0, KEY_QUERY_VALUE, &hkeyPort) == ERROR_SUCCESS) { @@ -192,7 +192,7 @@ DWORD ASPI_GetHCforController( int controller ) ERR("Could not open HKLM\\%s\n", debugstr_w(wDevicemapScsi)); return 0xFFFFFFFF; } - while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)/sizeof(wPortName[0])) == ERROR_SUCCESS) + while (RegEnumKeyW(hkeyScsi, i++, wPortName, ARRAY_SIZE(wPortName)) == ERROR_SUCCESS) { if (RegOpenKeyExW(hkeyScsi, wPortName, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hkeyPort) == ERROR_SUCCESS) @@ -215,7 +215,7 @@ DWORD ASPI_GetHCforController( int controller ) return 0xFFFFFFFF; } - if (RegEnumKeyW(hkeyPort, -num_ha, wBusName, sizeof(wBusName)/sizeof(wBusName[0])) != ERROR_SUCCESS) + if (RegEnumKeyW(hkeyPort, -num_ha, wBusName, ARRAY_SIZE(wBusName)) != ERROR_SUCCESS) { ERR("Failed to enumerate keys\n"); RegCloseKey(hkeyPort);