From 9a75cd800ef85e327cf8c9c3b6bcff52c7f66abe Mon Sep 17 00:00:00 2001 From: shatty Date: Sun, 21 Nov 2004 21:03:29 +0000 Subject: [PATCH] address compiler warnings git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10130 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/kits/app/bmessagerunner/GetInfoTester.cpp | 2 ++ .../kits/app/bpropertyinfo/PropertyTestcase.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/tests/kits/app/bmessagerunner/GetInfoTester.cpp b/src/tests/kits/app/bmessagerunner/GetInfoTester.cpp index ebdcdd0cbb..51d6613c29 100644 --- a/src/tests/kits/app/bmessagerunner/GetInfoTester.cpp +++ b/src/tests/kits/app/bmessagerunner/GetInfoTester.cpp @@ -30,8 +30,10 @@ //------------------------------------------------------------------------------ +#ifndef TEST_R5 static const char *kTesterSignature = "application/x-vnd.obos-messagerunner-getinfo-test"; +#endif static const bigtime_t kMinTimeInterval = 50000; diff --git a/src/tests/kits/app/bpropertyinfo/PropertyTestcase.cpp b/src/tests/kits/app/bpropertyinfo/PropertyTestcase.cpp index 658956047e..1834bf23f0 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyTestcase.cpp +++ b/src/tests/kits/app/bpropertyinfo/PropertyTestcase.cpp @@ -1,5 +1,5 @@ /* - $Id: PropertyTestcase.cpp,v 1.3 2002/09/28 00:19:49 shatty Exp $ + $Id: PropertyTestcase.cpp,v 1.4 2004/11/21 20:59:09 shatty Exp $ This file implements the first test for the OpenBeOS BPropertyInfo code. It tests the Construction use cases. It does so by doing the following: @@ -168,7 +168,7 @@ const uint32 PropertyTestcase::wildcardSpecifierTests[] = { uniqueSpecifier, char bflat_data[768]; } property_tests; - struct property_info prop1[] = { 0 }; + struct property_info prop1[] = { { 0 } }; struct property_info prop2[] = { { "test1", {B_GET_PROPERTY, B_SET_PROPERTY, B_EXECUTE_PROPERTY, B_DELETE_PROPERTY, B_CREATE_PROPERTY, B_COUNT_PROPERTIES, 7, @@ -199,14 +199,14 @@ const uint32 PropertyTestcase::wildcardSpecifierTests[] = { uniqueSpecifier, {0, B_DIRECT_SPECIFIER}, "test4: Test wildcard command and specifier", 3}, - 0 // terminate list + { 0 } // terminate list }; - struct value_info value1[] = { 0 }; + struct value_info value1[] = { { 0 } }; struct value_info value2[] = { { "Value1", 5, B_COMMAND_KIND, "This is the usage", 0 }, { "Value2", 6, B_TYPE_CODE_KIND, "This is the usage", 1 }, - 0 // terminate list + { 0 } // terminate list }; static property_tests theTests[] = { @@ -579,7 +579,7 @@ const uint32 PropertyTestcase::wildcardSpecifierTests[] = { uniqueSpecifier, property_info *propPtr; value_info *valuePtr; - for (i=0; i < sizeof(theTests) / sizeof(theTests[0]); i++) { + for (i=0; (unsigned)i < sizeof(theTests) / sizeof(theTests[0]); i++) { propTest = new BPropertyInfo(theTests[i].props, theTests[i].values); TestProperty(propTest, theTests[i].props, theTests[i].values, theTests[i].prop_count, theTests[i].value_count,