[PATCH 0/1] MR2648: wininet/tests: Consistently use lstrlenA() in the InternetGetConnectedStateExA() tests.
From: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/wininet/tests/internet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index fde1b65f5d2..a9726df6070 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1703,7 +1703,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(sz - 1 == lstrlenA(buffer), "Expected len %lu, got %u: %s\n", sz - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; @@ -1711,7 +1711,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz / 2 - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz / 2 - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(sz / 2 - 1 == lstrlenA(buffer), "Expected len %lu, got %u: %s\n", sz / 2 - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; @@ -1719,7 +1719,7 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 1, "Expected len 1, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); + ok(lstrlenA(buffer) == 1, "Expected len 1, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2648
Is there a reason to prefer lstrlenA here? I think that standard strlen is preferable in general. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2648#note_30237
Mostly because the test already uses lstrlenA(), which is probably because strlen() returns a size_t which is a pain to print. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2648#note_30468
participants (3)
-
Francois Gouget -
Francois Gouget (@fgouget) -
Jacek Caban (@jacek)