Michael Stefaniuc : iphlpapi/tests: Use the available ARRAY_SIZE() macro.

Alexandre Julliard julliard at winehq.org
Tue Jun 5 17:06:42 CDT 2018


Module: wine
Branch: master
Commit: 46c0e56fec4d6eddfd5fb79b878c1f2b29751fc9
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=46c0e56fec4d6eddfd5fb79b878c1f2b29751fc9

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Tue Jun  5 20:09:42 2018 +0200

iphlpapi/tests: Use the available ARRAY_SIZE() macro.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/iphlpapi/tests/iphlpapi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index ba7d7f1..d5613d7 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -1459,7 +1459,7 @@ static void test_GetAdaptersAddresses(void)
                   S(U(*ua)).Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH) ? 0 : ua->OnLinkPrefixLength);
             ua = ua->Next;
         }
-        for (i = 0, temp[0] = '\0'; i < sizeof(aa->ZoneIndices) / sizeof(aa->ZoneIndices[0]); i++)
+        for (i = 0, temp[0] = '\0'; i < ARRAY_SIZE(aa->ZoneIndices); i++)
             sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]);
         trace("status %u index %u zone %s\n", aa->OperStatus, aa->Ipv6IfIndex, temp );
         prefix = aa->FirstPrefix;
@@ -1836,7 +1836,7 @@ static void test_interface_identifier_conversion(void)
     ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret );
 
     nameW[0] = 0;
-    len = sizeof(nameW)/sizeof(nameW[0]);
+    len = ARRAY_SIZE(nameW);
     ret = pConvertInterfaceLuidToNameW( &luid, nameW, len );
     ok( !ret, "got %u\n", ret );
     ok( nameW[0], "name not set\n" );
@@ -1855,7 +1855,7 @@ static void test_interface_identifier_conversion(void)
     ok( ret == ERROR_NOT_ENOUGH_MEMORY, "got %u\n", ret );
 
     nameA[0] = 0;
-    len = sizeof(nameA)/sizeof(nameA[0]);
+    len = ARRAY_SIZE(nameA);
     ret = pConvertInterfaceLuidToNameA( &luid, nameA, len );
     ok( !ret, "got %u\n", ret );
     ok( nameA[0], "name not set\n" );




More information about the wine-cvs mailing list