Alexandre Julliard : msvcrt/tests: Don't check array pointer for NULL.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jan 12 12:15:22 CST 2016
Module: wine
Branch: master
Commit: 0ea5a01ca25f56372f1304214ae9c6db317bed8e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea5a01ca25f56372f1304214ae9c6db317bed8e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jan 13 01:55:39 2016 +0900
msvcrt/tests: Don't check array pointer for NULL.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/tests/cpp.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c
index c331db1..cbad1c1 100644
--- a/dlls/msvcrt/tests/cpp.c
+++ b/dlls/msvcrt/tests/cpp.c
@@ -452,8 +452,7 @@ static void test_exception(void)
{
/* Check the rtti */
type_info *ti = p__RTtypeid(&e);
- ok (ti && ti->mangled &&
- !strcmp(ti->mangled, ".?AVexception@@"), "bad rtti for e\n");
+ ok (ti && !strcmp(ti->mangled, ".?AVexception@@"), "bad rtti for e\n");
if (ti)
{
@@ -1036,15 +1035,13 @@ static void test_rtti(void)
child_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(child_class_sig0_rtti, object_hierarchy, base);
ti = p__RTtypeid(&simple_class_sig0);
- ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"),
- "incorrect rtti data\n");
+ ok (ti && !strcmp(ti->mangled, "simple_class"), "incorrect rtti data\n");
casted = p__RTCastToVoid(&simple_class_sig0);
ok (casted == (void*)&simple_class_sig0, "failed cast to void\n");
ti = p__RTtypeid(&child_class_sig0);
- ok (ti && ti->mangled && !strcmp(ti->mangled, "child_class"),
- "incorrect rtti data\n");
+ ok (ti && !strcmp(ti->mangled, "child_class"), "incorrect rtti data\n");
casted = p__RTCastToVoid(&child_class_sig0);
ok (casted == (void*)&child_class_sig0, "failed cast to void\n");
@@ -1064,15 +1061,13 @@ static void test_rtti(void)
}
ti = p__RTtypeid(&simple_class);
- ok (ti && ti->mangled && !strcmp(ti->mangled, "simple_class"),
- "incorrect rtti data\n");
+ ok (ti && !strcmp(ti->mangled, "simple_class"), "incorrect rtti data\n");
casted = p__RTCastToVoid(&simple_class);
ok (casted == (void*)&simple_class, "failed cast to void\n");
ti = p__RTtypeid(&child_class);
- ok (ti && ti->mangled && !strcmp(ti->mangled, "child_class"),
- "incorrect rtti data\n");
+ ok (ti && !strcmp(ti->mangled, "child_class"), "incorrect rtti data\n");
casted = p__RTCastToVoid(&child_class);
ok (casted == (void*)&child_class, "failed cast to void\n");
More information about the wine-cvs
mailing list