Nicolas Le Cam : msvcrt/tests: Avoid size_t in traces.

Alexandre Julliard julliard at winehq.org
Mon May 2 14:16:14 CDT 2011


Module: wine
Branch: master
Commit: acbb7b817a8193b24c2c7cca61dd002974f38382
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=acbb7b817a8193b24c2c7cca61dd002974f38382

Author: Nicolas Le Cam <niko.lecam at gmail.com>
Date:   Sat Apr 30 02:45:06 2011 +0200

msvcrt/tests: Avoid size_t in traces.

---

 dlls/msvcrt/tests/string.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index b72e001..06a4178 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -1332,31 +1332,31 @@ static void test_mbstowcs(void)
 
     err = pmbstowcs_s(&ret, wOut, 6, mSimple, _TRUNCATE);
     ok(err == 0, "err = %d\n", err);
-    ok(ret == 5, "ret = %d\n", (int)ret);
+    ok(ret == 5, "mbstowcs_s did not return 5\n");
     ok(!memcmp(wOut, wSimple, sizeof(wSimple)), "wOut = %s\n", wine_dbgstr_w(wOut));
 
     err = pmbstowcs_s(&ret, wOut, 6, mHiragana, _TRUNCATE);
     ok(err == 0, "err = %d\n", err);
-    ok(ret == 3, "ret = %d\n", (int)ret);
+    ok(ret == 3, "mbstowcs_s did not return 3\n");
     ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut));
 
     err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1);
     ok(err == 0, "err = %d\n", err);
-    ok(ret == 3, "ret = %d\n", (int)ret);
+    ok(ret == 3, "mbstowcs_s did not return 3\n");
 
     err = pwcstombs_s(&ret, mOut, 6, wSimple, _TRUNCATE);
     ok(err == 0, "err = %d\n", err);
-    ok(ret == 5, "ret = %d\n", (int)ret);
+    ok(ret == 5, "wcstombs_s did not return 5\n");
     ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut);
 
     err = pwcstombs_s(&ret, mOut, 6, wHiragana, _TRUNCATE);
     ok(err == 0, "err = %d\n", err);
-    ok(ret == 5, "ret = %d\n", (int)ret);
+    ok(ret == 5, "wcstombs_s did not return 5\n");
     ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut);
 
     err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1);
     ok(err == 0, "err = %d\n", err);
-    ok(ret == 5, "ret = %d\n", (int)ret);
+    ok(ret == 5, "wcstombs_s did not return 5\n");
 
     if(!pwcsrtombs) {
         win_skip("wcsrtombs not available\n");
@@ -1366,14 +1366,14 @@ static void test_mbstowcs(void)
     pwstr = wSimple;
     err = -3;
     ret = pwcsrtombs(mOut, &pwstr, 4, &err);
-    ok(ret == 4, "ret = %d\n", ret);
+    ok(ret == 4, "wcsrtombs did not return 4\n");
     ok(err == 0, "err = %d\n", err);
     ok(pwstr == wSimple+4, "pwstr = %p (wszSimple = %p)\n", pwstr, wSimple);
     ok(!memcmp(mOut, mSimple, ret), "mOut = %s\n", mOut);
 
     pwstr = wSimple;
     ret = pwcsrtombs(mOut, &pwstr, 5, NULL);
-    ok(ret == 4, "ret = %d\n", ret);
+    ok(ret == 4, "wcsrtombs did not return 4\n");
     ok(pwstr == NULL, "pwstr != NULL\n");
     ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut);
 }




More information about the wine-cvs mailing list