Alexandre Julliard : shlwapi/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jun 14 06:50:02 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 0cbd0a367d0de56a41e57e7b6afdfb1057e4eb68
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=0cbd0a367d0de56a41e57e7b6afdfb1057e4eb68

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 13 13:57:59 2006 +0200

shlwapi/tests: Use lstrlenA instead of strlen in ok() to avoid printf format warnings.

---

 dlls/shlwapi/tests/ordinal.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 5424298..44873bc 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -102,12 +102,12 @@ static void test_GetAcceptLanguagesA(voi
                 "last error wrong: got %08lx; expected ERROR_SUCCESS(NT4)/ERROR_CALL_NOT_IMPLEMENTED(98/ME)/"
 		"ERROR_PROC_NOT_FOUND(NT4)/ERROR_NO_IMPERSONATION_TOKEN(XP)\n", GetLastError());
             ok(exactsize == strlen(buffer),
-                 "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), exactsize);
+                 "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), exactsize);
             } else if((buffersize +1) == buffersize2) {
                 ok(ERROR_SUCCESS == GetLastError(),
                     "last error wrong: got %08lx; expected ERROR_SUCCESS\n", GetLastError());
                 ok(buffersize == strlen(buffer),
-                    "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize);
+                    "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), buffersize);
             } else
                 ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n",
                     retval, buffersize, buffer, GetLastError());
@@ -118,7 +118,7 @@ static void test_GetAcceptLanguagesA(voi
             ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(),
                "last error wrong: got %08lx; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());
             ok(buffersize2 == strlen(buffer),
-               "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize2);
+               "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), buffersize2);
             break;
         default:
             ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n",
@@ -137,7 +137,7 @@ static void test_GetAcceptLanguagesA(voi
             if((buffersize == exactsize) /* XP */ ||
                ((buffersize +1)== exactsize) /* 98 */)
                 ok(buffersize == strlen(buffer),
-                    "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize);
+                    "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), buffersize);
             else
                 ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n",
                     retval, buffersize, buffer, GetLastError());
@@ -148,7 +148,7 @@ static void test_GetAcceptLanguagesA(voi
             ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(),
                "last error wrong: got %08lx; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError());
             ok(buffersize2 == strlen(buffer),
-               "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize2);
+               "buffer content (length) wrong: got %08x, expected %08lx\n", lstrlenA(buffer), buffersize2);
             break;
         default:
             ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n",




More information about the wine-cvs mailing list