Alexandre Julliard : msvcrt/tests: Avoid printing pointer differences in traces.
Alexandre Julliard
julliard at winehq.org
Thu Jan 8 08:30:53 CST 2009
Module: wine
Branch: master
Commit: 2335a44ed6d597aafb74bbcf4b3bb45918928dfe
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2335a44ed6d597aafb74bbcf4b3bb45918928dfe
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jan 8 13:02:17 2009 +0100
msvcrt/tests: Avoid printing pointer differences in traces.
---
dlls/msvcrt/tests/heap.c | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c
index e094992..6e6b544 100644
--- a/dlls/msvcrt/tests/heap.c
+++ b/dlls/msvcrt/tests/heap.c
@@ -48,8 +48,7 @@ static void test_aligned_malloc(unsigned int size, unsigned int alignment)
{
void *saved;
saved = *(void **)((DWORD_PTR)((char *)mem - sizeof(void *)) & ~(sizeof(void *) - 1));
- trace("_aligned_malloc(%3d, %3d) returns %p, saved = %p, diff = %d\n",
- size, alignment, mem, saved, (char *)saved - (char *)mem);
+ trace("_aligned_malloc(%3d, %3d) returns %p, saved = %p\n", size, alignment, mem, saved );
}
p_aligned_free(mem);
}
@@ -79,8 +78,8 @@ static void test_aligned_offset_malloc(unsigned int size, unsigned int alignment
{
void *saved;
saved = *(void **)((DWORD_PTR)((char *)mem - sizeof(void *)) & ~(sizeof(void *) - 1));
- trace("_aligned_offset_malloc(%3d, %3d, %3d) returns %p, saved = %p, diff = %d\n",
- size, alignment, offset, mem, saved, (char *)saved - (char *)mem);
+ trace("_aligned_offset_malloc(%3d, %3d, %3d) returns %p, saved = %p\n",
+ size, alignment, offset, mem, saved);
}
p_aligned_free(mem);
}
@@ -116,8 +115,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne
{
void *saved;
saved = *(void **)((DWORD_PTR)((char *)mem - sizeof(void *)) & ~(sizeof(void *) - 1));
- trace("_aligned_malloc(%3d, %3d) returns %p, saved = %p, diff = %d\n",
- size1, alignment, mem, saved, (char *)saved - (char *)mem);
+ trace("_aligned_malloc(%3d, %3d) returns %p, saved = %p\n", size1, alignment, mem, saved);
}
mem2 = p_aligned_realloc(mem, size2, alignment);
@@ -132,8 +130,8 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne
{
void *saved;
saved = *(void **)((DWORD_PTR)((char *)mem2 - sizeof(void *)) & ~(sizeof(void *) - 1));
- trace("_aligned_realloc(%p, %3d, %3d) returns %p, saved = %p, diff = %d\n",
- mem, size2, alignment, mem2, saved, (char *)saved - (char *)mem2);
+ trace("_aligned_realloc(%p, %3d, %3d) returns %p, saved = %p\n",
+ mem, size2, alignment, mem2, saved);
}
if (mem1)
{
@@ -189,8 +187,8 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2,
{
void *saved;
saved = *(void **)((DWORD_PTR)((char *)mem - sizeof(void *)) & ~(sizeof(void *) - 1));
- trace("_aligned_offset_malloc(%3d, %3d, %3d) returns %p, saved = %p, diff = %d\n",
- size1, alignment, offset, mem, saved, (char *)saved - (char *)mem);
+ trace("_aligned_offset_malloc(%3d, %3d, %3d) returns %p, saved = %p\n",
+ size1, alignment, offset, mem, saved);
}
mem2 = p_aligned_offset_realloc(mem, size2, alignment, offset);
@@ -205,8 +203,8 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2,
{
void *saved;
saved = *(void **)((DWORD_PTR)((char *)mem2 - sizeof(void *)) & ~(sizeof(void *) - 1));
- trace("_aligned_offset_realloc(%p, %3d, %3d, %3d) returns %p, saved = %p, diff = %d\n",
- mem, size2, alignment, offset, mem2, saved, (char *)saved - (char *)mem2);
+ trace("_aligned_offset_realloc(%p, %3d, %3d, %3d) returns %p, saved = %p\n",
+ mem, size2, alignment, offset, mem2, saved);
}
if (mem1)
{
More information about the wine-cvs
mailing list