--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/testappobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/testappobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -76,6 +76,7 @@
iWait->AsyncStop();
+ return 0;
}
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertestobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertestobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -74,6 +74,7 @@
User::Leave(KErrGeneral);
iLeave = EFalse;
}
+ return 0;
}
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp Tue May 11 17:01:36 2010 +0300
@@ -186,5 +186,6 @@
return error;
}
+ return 0;
}
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -292,7 +292,7 @@
const TLiwGenericParam* p= NULL;
- CLiwIterable* iter;
+ CLiwIterable* iter = NULL;
TLiwVariant Map;
const CLiwMap* infomap;
TInt err= 0;
@@ -1410,7 +1410,7 @@
const TLiwGenericParam* p= NULL;
- CLiwIterable* iter;
+ CLiwIterable* iter = NULL;
TLiwVariant Map;
const CLiwMap* infomap;
TInt err= 0;
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/testappobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/testappobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -75,7 +75,7 @@
}
-
+ return 0;
}
@@ -90,4 +90,6 @@
iWait = aWait;
iReason = 10 ; //Reason of failure can be either 0 or some negative valuw which incater
//error but it cant be greater than 0
- }
\ No newline at end of file
+ }
+
+
\ No newline at end of file
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -185,7 +185,7 @@
{
return KErrGeneral;
}
- if( errorcode = res )
+ if( errorcode == res )
res = KErrNone;
return res;
@@ -225,7 +225,7 @@
// __UHEAP_MARKEND;
- return result;
+ //return result;
}
TInt CTCalendarAddTest::AddApptWithWeeklyRepeat(CStifItemParser& /*aItem*/)
{
@@ -242,7 +242,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarAddTest::AddApptWithMonthlyRepeat(CStifItemParser& /*aItem*/)
{
@@ -259,7 +259,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarAddTest::AddApptWithAttendees(CStifItemParser& /*aItem*/)
{
@@ -276,7 +276,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarAddTest::AddNewAnniversary(CStifItemParser& /*aItem*/)
{
@@ -293,7 +293,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarAddTest::AddNewDayEvent(CStifItemParser& /*aItem*/)
{
@@ -310,7 +310,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarAddTest::AddNewReminder(CStifItemParser& /*aItem*/)
{
@@ -327,7 +327,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarAddTest::AddNewTodo(CStifItemParser& /*aItem*/)
{
@@ -344,7 +344,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarAddTest::AddAll(CStifItemParser& aItem)
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,7 @@
int UpdateInstanceWithRepeat();
int UpdateEntryWithRepeatAndExceptionDates();
int AddEntryWithVeryLongDescription();
- TDesC& GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC localuid, const TDesC& calname );
+ TDesC GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC localuid, const TDesC& calname );
CTestSync();
~CTestSync();
@@ -1304,7 +1304,7 @@
}
-TDesC& CTestSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
+TDesC CTestSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
{
inparam->Reset();
outparam->Reset();
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp Tue May 11 17:01:36 2010 +0300
@@ -59,7 +59,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
- TInt32 errCode;
+ TInt32 errCode = 0;
TInt pos = 0;
// Traiverse the List and Fill in the Log Files
@@ -313,7 +313,7 @@
{
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam));
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
- TInt errCode;
+ TInt errCode = 0;
if( p )
{
errCode = p->Value().AsTInt32();
@@ -387,6 +387,7 @@
iResult = errCode;
return errCode;
}
+ return 0;
}
@@ -567,7 +568,7 @@
filterMap->InsertL(KCalendarName,TLiwVariant(_L("C:Calendar")));
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam/*, KLiwOptASyncronous, iCallback*/));
- TInt errCode;
+ TInt errCode = 0;
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
if( p )
{
@@ -624,7 +625,7 @@
filterMap->InsertL(KCalendarName,TLiwVariant(_L("C:CalendarFileZ")));
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam/*, KLiwOptASyncronous, iCallback*/));
- TInt errCode;
+ TInt errCode = 0;
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
if( p )
{
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp Tue May 11 17:01:36 2010 +0300
@@ -297,7 +297,7 @@
{
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam));
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
- TInt errCode;
+ TInt errCode = 0;
if( p )
{
errCode = p->Value().AsTInt32();
@@ -373,9 +373,10 @@
CTestAsyncGuid* test = CTestAsyncGuid::NewL();
int res = test->Start(flag, async);
delete test;
+ __UHEAP_MARKEND;
return res;
- __UHEAP_MARKEND;
+
}
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp Tue May 11 17:01:36 2010 +0300
@@ -59,7 +59,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
- TInt32 errCode;
+ TInt32 errCode = 0;
TInt pos = 0;
// Traiverse the List and Fill in the Log Files
@@ -305,7 +305,7 @@
{
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam));
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
- TInt errCode;
+ TInt errCode = 0;
if( p )
{
errCode = p->Value().AsTInt32();
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertestobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertestobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -69,6 +69,7 @@
if(iWait)
iWait->AsyncStop();
+ return 0;
}
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -43,7 +43,7 @@
void GetLocalUid( const TDesC& aLocalUid, TCalLocalUid& aOutLocalUid );
void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid );
-TDesC& GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname);
+TDesC GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname);
class CCalGetListCallback : public MLiwNotifyCallback
{
@@ -1988,7 +1988,7 @@
aOutGlobalUid.Copy( aGlobalUid );
}
-TDesC& GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
+TDesC GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
{
inparam->Reset();
outparam->Reset();
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,7 @@
int UpdateTodoEntryWithGlobalIdL();
int UpdateAppointmentEntryWithNewTimeAndGlobalIdL();
- TDesC& GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname);
+ TDesC GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname);
CTestUpdateSync();
~CTestUpdateSync();
@@ -197,7 +197,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewTimeL(CStifItemParser& /*aItem*/)
@@ -215,7 +215,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewAttendeesL(CStifItemParser& /*aItem*/)
@@ -233,7 +233,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
@@ -252,7 +252,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarUpdateTest::UpdateDayEventL(CStifItemParser& /*aItem*/)
@@ -270,7 +270,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarUpdateTest::UpdateReminderL(CStifItemParser& /*aItem*/)
@@ -288,7 +288,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarUpdateTest::UpdateTodoEntryL(CStifItemParser& /*aItem*/)
{
@@ -305,7 +305,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewRepeatL(CStifItemParser& /*aItem*/)
@@ -323,7 +323,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithGlobalIdL(CStifItemParser& /*aItem*/)
{
@@ -340,7 +340,7 @@
// __UHEAP_MARKEND;
- return result;
+// return result;
}
TInt CTCalendarUpdateTest::UpdateAnniversaryWithGlobalIdL(CStifItemParser& /*aItem*/)
@@ -358,7 +358,7 @@
// __UHEAP_MARKEND;
- return result;
+ //return result;
}
TInt CTCalendarUpdateTest::UpdateDayEventWithGlobalIdL(CStifItemParser& /*aItem*/)
@@ -376,7 +376,7 @@
// __UHEAP_MARKEND;
- return result;
+ //return result;
}
TInt CTCalendarUpdateTest::UpdateReminderWithGlobalIdL(CStifItemParser& /*aItem*/)
@@ -394,7 +394,7 @@
// __UHEAP_MARKEND;
- return result;
+ //return result;
}
TInt CTCalendarUpdateTest::UpdateTodoEntryWithGlobalIdL(CStifItemParser& /*aItem*/)
{
@@ -411,7 +411,7 @@
// __UHEAP_MARKEND;
- return result;
+ //return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewTimeAndGlobalIdL(CStifItemParser& /*aItem*/)
{
@@ -428,7 +428,7 @@
// __UHEAP_MARKEND;
- return result;
+ //return result;
}
TInt CTestUpdateSync::UpdateAppointmentEntryL()
@@ -2655,7 +2655,7 @@
}
-TDesC& CTestUpdateSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
+TDesC CTestUpdateSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
{
inparam->Reset();
outparam->Reset();
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp Tue May 11 17:01:36 2010 +0300
@@ -180,7 +180,7 @@
}
CCalGetlistTestCases::CCalGetlistTestCases( TInt& aResult, TBool aEntryArray) : CActive(EPriorityStandard), iResult(aResult),
- iEntryArray(aEntryArray)
+ iEntryArray(aEntryArray),iTestCaseType(KGetlistGuidFilterAsync)
{
}
@@ -194,9 +194,9 @@
_LIT(KSearchTexttest ,"Meeting");
void CCalGetlistTestCases::RunL()
{
- CCalendarFilter *filter;
+ CCalendarFilter *filter = NULL;
- CEntryAttributes* entryObj;
+ CEntryAttributes* entryObj = NULL;
RPointerArray<TUIDSet> arruids(5);
TUIDSet* uids = NULL;
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -3664,7 +3664,7 @@
TInt pos = 0 ;
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
- TInt32 err;
+ TInt32 err = 0;
if(output)
{
err = output->Value().AsTInt32();
@@ -3707,7 +3707,7 @@
TInt pos = 0 ;
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
- TInt32 err;
+ TInt32 err = 0;
if(output)
{
err = output->Value().AsTInt32();
@@ -3776,7 +3776,7 @@
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
cells = User::CountAllocCells();
- TInt32 err;
+ TInt32 err = 0;
if(output)
{
err = output->Value().AsTInt32();
@@ -3963,7 +3963,7 @@
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
cells = User::CountAllocCells();
- TInt32 err;
+ TInt32 err = 0;
if(output)
{
err = output->Value().AsTInt32();
@@ -4041,7 +4041,7 @@
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
cells = User::CountAllocCells();
- TInt32 err;
+ TInt32 err = 0;
if(output)
{
err = output->Value().AsTInt32();
@@ -4119,7 +4119,7 @@
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
cells = User::CountAllocCells();
- TInt32 err;
+ TInt32 err = 0;
if(output)
{
err = output->Value().AsTInt32();
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp Tue May 11 17:01:36 2010 +0300
@@ -586,7 +586,8 @@
iWaitSchedular = new(ELeave) CActiveSchedulerWait();
}
-CCalDelTestCases::CCalDelTestCases( TInt& aResult) : CActive(EPriorityStandard), iResult(aResult)
+CCalDelTestCases::CCalDelTestCases( TInt& aResult) : CActive(EPriorityStandard),
+ iResult(aResult),iTestCaseType(KDeleteUsingGuidsAsync)
{
}
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp Tue May 11 17:01:36 2010 +0300
@@ -180,7 +180,7 @@
}
CCalGetlistTestCases::CCalGetlistTestCases( TInt& aResult, TBool aEntryArray) : CActive(EPriorityStandard), iResult(aResult),
- iEntryArray(aEntryArray)
+ iEntryArray(aEntryArray),iTestCaseType( KGetlistGuidFilterAsync )
{
}
@@ -194,9 +194,9 @@
_LIT(KSearchTexttest ,"Meeting");
void CCalGetlistTestCases::RunL()
{
- CCalendarFilter *filter;
+ CCalendarFilter *filter = NULL;
- CEntryAttributes* entryObj;
+ CEntryAttributes* entryObj = NULL;
RPointerArray<TUIDSet> arruids(5);
TUIDSet* uids = NULL;
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -199,7 +199,7 @@
// TInt Noofitems = allCalendarNames->Count();
- CCalendarService* service ;
+ CCalendarService* service = NULL;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -276,7 +276,7 @@
// CDesCArray* allCalendarNames;
- CCalendarService* service ;
+ CCalendarService* service = NULL;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -370,7 +370,7 @@
// TInt Noofitems;
- CCalendarService* service ;
+ CCalendarService* service = NULL;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -414,7 +414,7 @@
// CDesCArray* allCalendarNames;
- CCalendarService* service ;
+ CCalendarService* service = NULL;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -521,7 +521,7 @@
CDesCArray *allCalendarNames = NULL;
- CCalendarService* service ;
+ CCalendarService* service = NULL;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -575,7 +575,7 @@
{
__UHEAP_MARK;
TInt result = KErrNone;
- TInt result_one;
+ TInt result_one = KErrNone;
TInt result_two = KErrNone;
TInt result_three = KErrNone;
TInt result_four = KErrNone;
@@ -595,7 +595,7 @@
RPointerArray<CCalEntry> entryArray(1);
TUIDSet* uids = NULL;
- CCalendarService* service ;
+ CCalendarService* service = NULL;
TRAPD(err_one,service = CCalendarService::NewL());
RemoveCalendarFile( service, KTestCal1File );
@@ -653,7 +653,7 @@
result_two = err_three;
- TRAPD( err_four, service->GetListL( KTestCal1File, -2000000, entryArray ));
+ TRAPD( err_four, service->GetListL( KTestCal1File, 2000000, entryArray ));
if ( err_four == KErrNone )
{
if(entryArray.Count())
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp Tue May 11 17:01:36 2010 +0300
@@ -796,7 +796,7 @@
// Import with invalid luid
new_expParams->AddLocalUid( 10000 );
- new_expParams->AddLocalUid( -3000 );
+ new_expParams->AddLocalUid( 3000 );
new_expParams->SetExportFileNameL(KVcalImportGuidsFile);
delete buffer;
buffer = NULL;
@@ -1153,7 +1153,7 @@
}
CCalImpTestCases::CCalImpTestCases( TInt& aResult, TInt aVCalOrICal): CActive(EPriorityStandard), iResult(aResult) ,
- iVCalOrICal(aVCalOrICal)
+ iVCalOrICal(aVCalOrICal) ,iTestCaseType (KImportGuidAsync)
{
}
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -295,7 +295,7 @@
if(iCase == EModifyContactComplete)
{
//call the get list once again to check whether the contact is modified
- CStifItemParser* stiff;
+ CStifItemParser* stiff = NULL;
iCase = EModifyContactVerify;
//this time call the getlist with the contact id to get only the modified contact
GetContactALL(*stiff);
@@ -576,7 +576,7 @@
else if(aEventId == KLiwEventCompleted && code == KErrNone )
{
iCase = EVerifyGroupAdd;
- CStifItemParser* stiff;
+ CStifItemParser* stiff = NULL;
iIdArrayList.ResetAndDestroy();
GetGroup(*stiff);
}
@@ -610,7 +610,7 @@
else if(aEventId == KLiwEventCompleted && code == KErrNone )
{
iCase = EVerifyImport;
- CStifItemParser* stiff;
+ CStifItemParser* stiff = NULL;
GetContactALL(*stiff);
}
else
@@ -623,7 +623,7 @@
if(aEventId == KLiwEventCompleted && code == KErrNone )
{
iCase = EVerifyOrganizeDelete;
- CStifItemParser* stiff;
+ CStifItemParser* stiff = NULL;
iIdArrayList.ResetAndDestroy();
GetGroup(*stiff);
}
@@ -714,7 +714,7 @@
if(firstName.CompareF(_L("Barbie")) != 0)
{
iResult = KErrGeneral;
- return;
+ return 0;
}
if(map->FindL(KSecondName,mapfield))
@@ -725,7 +725,7 @@
if(secName.CompareF(_L("Doll")) != 0)
{
iResult = KErrGeneral;
- return;
+ return 0;
}
if(map->FindL(KCallerObjImg,mapfield))
@@ -736,7 +736,7 @@
if(callerObjImg.CompareF(_L("C:\\data\\images\\pic.jpg")) != 0)
{
iResult = KErrGeneral;
- return;
+ return 0;
}
if(map->FindL(KNote,mapfield))
mapField = mapfield.AsMap();
@@ -746,7 +746,7 @@
if(Note.CompareF(_L("Lead role in Barbie, the island princess")) != 0)
{
iResult = KErrGeneral;
- return;
+ return 0;
}
if(map->FindL(KXSPID,mapfield))
@@ -763,7 +763,7 @@
if(ptrVal.CompareF(_L("Yahoo:Barbie@yahoo.co.in")) != 0 && ptrVal.CompareF(_L("Google:Barbie@gmail.com")) != 0)
{
iResult = KErrGeneral;
- return;
+ return 0;
}
}
}
@@ -775,6 +775,7 @@
iResult = code;
}
}
+ return 0;
}
void CTestProvider::LoadService()
@@ -1400,7 +1401,7 @@
}
TInt CTestProvider :: ModifyGroup(CStifItemParser& /*aItem*/)
- {
+ { return 0;
}
TInt CTestProvider :: ExportL( CStifItemParser& aItem )
@@ -1995,14 +1996,14 @@
*/
TInt CTestProvider :: ModifyContactPosBased(CStifItemParser& /*aItem*/)
{
-
+ return 0;
}
/**
* Math operation BearingTo Test
*/
TInt CTestProvider ::ModifyGroupPosBased(CStifItemParser& /*aItem*/)
- {
+ { return 0;
}
TInt CTestProvider :: ExportPosBased(CStifItemParser& aItem)
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -168,6 +168,7 @@
User::Leave(KErrNotFound);
}
} */
+ return 0;
}
TInt Ctcontactsgetidsprovidertest::AddL( CStifItemParser& aItem )
{
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -417,7 +417,7 @@
file.Flush();
file.Close();
CleanupStack::PopAndDestroy();
-
+ return 0;
}
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_observer.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_observer.cpp Tue May 11 17:01:36 2010 +0300
@@ -73,7 +73,7 @@
}
-
+ return 0;
}
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -158,7 +158,7 @@
TPtrC value(KNullDesC);
//CContactCallback* callbk=new(ELeave) CContactCallback;
TPtr8 cntIdPtrVal(acntId->Des());
- CContactIter* iterVal;
+ CContactIter* iterVal = NULL;
TRAPD(err, iterVal = cntservice->GetListL(EContacts,cntIdPtrVal));
if(err != KErrNone)
{
@@ -967,7 +967,7 @@
aItem.GetNextInt(count) ;
/*Add group1 to phonebook */
- TInt err1;
+ TInt err1 = 0;
TRAPD(err,icontactservice->AddL(icallback,0,singleContact,KNullDesC8,KGroup));
if(err || err1)
{
@@ -1361,7 +1361,7 @@
icontactservice=CContactService::NewL();
/* Add the contactitem */
- HBufC8* cntId;
+ HBufC8* cntId = NULL;
TRAPD(error,cntId= icontactservice->AddL(singleContact));
@@ -1441,7 +1441,7 @@
// Print to log file
iLog->Log( KExample );
- HBufC8* grpId;
+ HBufC8* grpId = NULL;
TInt count;
/* Group1 to add to phonebook */
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -909,7 +909,8 @@
CleanupClosePushL(idArray);
//idArray.AppendL(contactId);
- TInt err1,err2;
+ TInt err1 = 0;
+ TInt err2 = 0;
TRAP(err1,icontactservice->DeleteL(icallback,0,idArray));
if (err1 || err2)
{
@@ -962,7 +963,8 @@
CleanupClosePushL(idArray);
//idArray.AppendL(contactId);
- TInt err1,err2;
+ TInt err1 = 0;
+ TInt err2 = 0;
TRAP(err1,icontactservice->DeleteL(icallback,0,idArray));
if(err1 || err2)
{
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -197,7 +197,8 @@
TInt flag=0,cnt=0;
/*call getlist to get the contactid for export */ \
- TInt err1, err2;
+ TInt err1 = 0;
+ TInt err2 = 0;
TRAP(err1,icontactservice->GetListL(icallback,1,EContacts,KNullDesC8));
CActiveScheduler::Start();
@@ -212,10 +213,11 @@
/* verify whther export returns the expected error */
aItem.GetNextInt(flag) ;
if(icallback->iError)
- return KErrNone;
+ return KErrNone;
if(icallback->iError == flag)
- return KErrNone;
+ return KErrNone;
+ return 0;
}
/* exporting 2 contacts */
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -365,11 +365,11 @@
delete icontactservice;
__UHEAP_MARKEND;
return KErrNone ;
- delete icallback;
- delete icontactservice;
- __UHEAP_MARKEND;
+ // delete icallback;
+ //delete icontactservice;
+ //__UHEAP_MARKEND;
- return KErrGeneral;
+ //return KErrGeneral;
}
@@ -734,7 +734,7 @@
_LIT( KLog4, "before calling add" );
iLog->Log( KLog4 );
/* Add the contactitem */
- HBufC8* cntId;
+ HBufC8* cntId = NULL;
TRAPD(err,cntId= icontactservice->AddL(singleContact));
TPtr8 cntIdPtrVal(cntId->Des());
@@ -919,7 +919,7 @@
// aItem.GetNextInt(count) ;
/* Add the contactitem */
- HBufC8* cntId;
+ HBufC8* cntId = NULL;
TRAPD(err,cntId= icontactservice->AddL(singleContact));
TPtr8 cntIdPtrVal(cntId->Des());
@@ -941,7 +941,7 @@
return KErrGeneral ;
}
newFields = ETrue;
- CContactIter* iterVal;
+ CContactIter* iterVal = NULL;
TPtr8 cntIdPtr(cntId->Des());
TRAPD(error, iterVal = icontactservice->GetListL(EContacts,cntIdPtr));
--- a/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/src/landmarks_inputparamsblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/src/landmarks_inputparamsblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -1220,7 +1220,7 @@
variant.Reset();
var.Reset();
}
-
+ return 0;
}
TInt Clandmarks_inputparams::CheckDescending(TType aType, CLiwIterable* aIter)
@@ -1253,7 +1253,7 @@
variant.Reset();
var.Reset();
}
-
+ return 0;
}
// ========================== OTHER EXPORTED FUNCTIONS =========================
// None
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp Tue May 11 17:01:36 2010 +0300
@@ -94,6 +94,7 @@
{
iWaitSchedular->AsyncStop();
}
+ return 0;
}
CTestAsync* CTestAsync::NewL(TInt type)
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -4256,7 +4256,7 @@
TLiwGenericParam param;
TInt index = 0;
- CActiveSchedulerWait* WaitSchedular;
+ CActiveSchedulerWait* WaitSchedular = NULL;
CLiwMap* landmarkMap = CLiwDefaultMap::NewL();
TInt32 test_val = KErrGeneral;
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tprovidertestobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tprovidertestobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -76,6 +76,7 @@
if(iWait)
iWait->AsyncStop();
+ return 0;
}
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp Tue May 11 17:01:36 2010 +0300
@@ -218,7 +218,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val ;
+ TInt Val = 0;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = TraceTOL()) );
delete cleanup ;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -2200,7 +2200,7 @@
outputlist->Reset() ;
inputlist->Reset() ;
- ASyncLocCBF* callBack ;
+ ASyncLocCBF* callBack = NULL;
locinterface->ExecuteCmdL(CmdBuf , *inputlist , *outputlist,KLiwOptASyncronous, callBack);
@@ -2958,9 +2958,9 @@
_LIT8(KService, "Service.Location");
_LIT8(KIDataSource,"ILocation");
-
+ __UHEAP_MARKEND ;
return KErrNone ; //Manual test case
- CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
+ /*CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
// Input and output parameter list
CLiwGenericParamList* inputlist = &(ServiceHandler->InParamListL());
@@ -3041,9 +3041,9 @@
delete ServiceHandler ;
a.ResetAndDestroy() ;
- // delete OutParmList ;
- __UHEAP_MARKEND ;
- return result ;
+ // delete OutParmList ;*/
+
+ //return result ;
}
@@ -3063,7 +3063,7 @@
iLog->Log(KTLocTest) ;
return KErrNone ; //Manual test case
- TRequestStatus Status = KRequestPending ;
+ /*TRequestStatus Status = KRequestPending ;
RThread FunctionThread ;
TInt ret = FunctionThread.Create(_L("ServiceFailed Thread") , ServiceFailedTest ,KDefaultStackSize ,
@@ -3091,7 +3091,7 @@
}
- return ret;
+ return ret; */
}
@@ -3229,7 +3229,7 @@
}
return KErrNone ;
- return KErrGeneral;
+ //return KErrGeneral;
}
@@ -3575,7 +3575,7 @@
iLog->Log(KTLocTest) ;
return KErrNone ; //This is a manul test case
- CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
+ /*CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
// Input and output parameter list
CLiwGenericParamList* inputlist = &(ServiceHandler->InParamListL());
@@ -3658,7 +3658,7 @@
_LIT(Kerr , "Time out value not set correctly") ;
return KErrNone ;
-
+ */
}
/**
@@ -6511,7 +6511,7 @@
outputlist->Reset() ;
inputlist->Reset() ;
- ASyncLocCBF* callBack ;
+ ASyncLocCBF* callBack = NULL;
locinterface->ExecuteCmdL(CmdBuf , *inputlist , *outputlist,KLiwOptASyncronous, callBack);
@@ -6795,7 +6795,7 @@
TInt CTestProvider::GetLocPosBasedWrongVal1(CStifItemParser& /*aItem*/)
{
//currently not needed
-
+ return 0;
}
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp Tue May 11 17:01:36 2010 +0300
@@ -173,7 +173,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val ;
+ TInt Val = 0;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = ConcurrentGetLocCallsL()) );
delete cleanup ;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp Tue May 11 17:01:36 2010 +0300
@@ -299,7 +299,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val ;
+ TInt Val = 0;
TInt *flag = static_cast<TInt *>(aFlag);
TInt err;
//Install a new active scheduler to this thread
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp Tue May 11 17:01:36 2010 +0300
@@ -700,7 +700,7 @@
//TInt start = User::CountAllocCells();
ASyncLocCB MyUpdates ;
- TInt errRet;
+ TInt errRet = 0;
_LIT8(KService, "Service.Location");
_LIT8(KIDataSource,"ILocation");
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp Tue May 11 17:01:36 2010 +0300
@@ -39,7 +39,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
-
+ return 0;
}
GetLoctionCancel() : iRetStatus(KErrGeneral) //Default constructor
@@ -151,7 +151,7 @@
{
// __UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt val ;
+ TInt val = 0;
TRAPD(err , (val = GetLocCancelL() ) ) ;
delete cleanup ;
// __UHEAP_MARKEND;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp Tue May 11 17:01:36 2010 +0300
@@ -38,7 +38,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
-
+ return 0;
}
WrongNotificationGetLoc() : iRetStatus(KErrGeneral) //Default constructor
@@ -153,7 +153,7 @@
{
// __UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt val ;
+ TInt val = 0;
TRAPD(err , (val = GetLocWrongCancelL() ) ) ;
delete cleanup ;
// __UHEAP_MARKEND;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp Tue May 11 17:01:36 2010 +0300
@@ -56,7 +56,7 @@
TInt Index = 0 ;
const TLiwGenericParam *GenericParam = aEventParamList.FindFirst(Index , KErrorCode );
- TInt error ;
+ TInt error = 0;
if(GenericParam)
{
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp Tue May 11 17:01:36 2010 +0300
@@ -291,9 +291,9 @@
{
return err ;
}
-
+ else
return val ;
- return 0 ;
+
}
\ No newline at end of file
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp Tue May 11 17:01:36 2010 +0300
@@ -206,7 +206,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val ;
+ TInt Val = 0;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = TraceConcurrentCallsL()) );
delete cleanup ;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp Tue May 11 17:01:36 2010 +0300
@@ -38,7 +38,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
-
+ return 0;
}
TraceLoctionCancel() : iRetStatus(KErrGeneral) //Default constructor
@@ -150,7 +150,7 @@
{
// __UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt val ;
+ TInt val = 0;
TRAPD(err , (val = TraceLocCancelL() ) ) ;
delete cleanup ;
// __UHEAP_MARKEND;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp Tue May 11 17:01:36 2010 +0300
@@ -38,7 +38,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
-
+ return 0;
}
WrongNotificationTraceLoc() : iRetStatus(KErrGeneral) //Default constructor
@@ -158,7 +158,7 @@
{
// __UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt val ;
+ TInt val = 0;
TRAPD(err , (val = TraceLocWrongCancelL() ) ) ;
delete cleanup ;
// __UHEAP_MARKEND;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp Tue May 11 17:01:36 2010 +0300
@@ -350,7 +350,7 @@
TInt ServiceFailedTest(TAny */*Arg*/)
{
- TInt errRet;
+ TInt errRet = 0;
CTrapCleanup* cleanup = CTrapCleanup::New();
TRAPD(err , errRet = ServiceFailedFunctionL()) ;
delete cleanup ;
@@ -394,7 +394,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val ;
+ TInt Val = 0;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = ConcurrentGetLocCallsL()) );
delete cleanup ;
@@ -450,7 +450,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val ;
+ TInt Val = 0;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = ConcurrentTraceCallsL()) );
delete cleanup ;
@@ -468,7 +468,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val ;
+ TInt Val = 0;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = TraceTimeOutFuncL()) );
delete cleanup ;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -814,6 +814,7 @@
delete CoreObj;
__UHEAP_MARKEND ;
+ return error;
}
TInt CTLocTest :: EmptyCancelLocAsynch(CStifItemParser& /*aItem*/)
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tstraysignaltest.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tstraysignaltest.cpp Tue May 11 17:01:36 2010 +0300
@@ -122,7 +122,7 @@
TInt StrayTest(TAny */*Arg*/)
{
- TInt errval;
+ TInt errval = 0;
CTrapCleanup* cleanup = CTrapCleanup::New();
//Install a new active scheduler to this thread
TRAPD(err , errval = StrayTestL()) ;
--- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -3229,7 +3229,7 @@
TInt iRequestType;
public :
TInt HandleNotifyL(HPositionGenericInfo* aOutPos , TInt aError) ;
- TraceLCallBackOpts3(TInt transId,TInt req) :iCount(0) , iRetStatus(KErrGeneral){+
+ TraceLCallBackOpts3(TInt transId,TInt req) :iCount(0) , iRetStatus(KErrGeneral){
iTransactionId = transId;
iRequestType = req;
}
@@ -3785,7 +3785,7 @@
//
TInt CSAPILocTest::GetPositionOpts1( CStifItemParser& /*aItem*/ )
{
- TInt ret;
+ TInt ret = 0;
TPositionInfo currPos;
TPositionUpdateOptions options;
TTimeIntervalMicroSeconds aTimeOut = 0;
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp Tue May 11 17:01:36 2010 +0300
@@ -98,6 +98,6 @@
}
iRetVal = KErrNone ;
-
+ return 0;
}
\ No newline at end of file
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp Tue May 11 17:01:36 2010 +0300
@@ -87,10 +87,14 @@
iter = LogService->GetListL(filter) ;
- while (aEvent = iter->NextL())
- {
+ while (1){
+ aEvent = iter->NextL();
+ if(aEvent){
LogService->DeleteEventL(aEvent->Id()) ;
delete aEvent ;
+ }
+ else
+ break;
}
delete iter ;
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp Tue May 11 17:01:36 2010 +0300
@@ -87,9 +87,12 @@
CLogIter *iter = LogService->GetListL(filter) ;
CLogsEvent *iterevents ;
- while(iterevents = iter->NextL())
- {
+ while(1){
+ iterevents = iter->NextL();
+ if(iterevents)
delete iterevents ;
+ else
+ break;
}
delete updatedEvent ;
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp Tue May 11 17:01:36 2010 +0300
@@ -83,9 +83,12 @@
CLogIter *iter = LogService->GetListL(filter) ;
- while (events = iter->NextL())
- {
+ while(1){
+ events = iter->NextL();
+ if(events)
delete events ;
+ else
+ break;
}
delete event ;
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -489,9 +489,12 @@
CLogsEvent *aEvent ;
- while(aEvent = iter->NextL())
- {
+ while(1){
+ aEvent = iter->NextL();
+ if(aEvent)
delete aEvent ;
+ else
+ break;
}
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertestobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertestobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -68,6 +68,7 @@
if(iWait)
iWait->AsyncStop();
+ return 0;
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tgetlist.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tgetlist.cpp Tue May 11 17:01:36 2010 +0300
@@ -183,10 +183,14 @@
iter = iLoggingService->GetListL(filter) ;
CLogsEvent *iterevents ;
- while (iterevents = iter->NextL())
- {
+ while (1){
+ iterevents = iter->NextL();
+ if(iterevents){
iLoggingService->DeleteEventL(iterevents->Id()) ;
delete iterevents ;
+ }
+ else
+ break;
}
iter->DoCancel();
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp Tue May 11 17:01:36 2010 +0300
@@ -208,7 +208,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
@@ -401,7 +401,7 @@
-
+ return 0;
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp Tue May 11 17:01:36 2010 +0300
@@ -95,6 +95,6 @@
}
iRetVal = KErrNone ;
-
+ return 0;
}
\ No newline at end of file
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp Tue May 11 17:01:36 2010 +0300
@@ -300,7 +300,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
@@ -568,7 +568,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp Tue May 11 17:01:36 2010 +0300
@@ -256,7 +256,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
@@ -514,7 +514,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
@@ -742,7 +742,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp Tue May 11 17:01:36 2010 +0300
@@ -278,7 +278,7 @@
a.ResetAndDestroy() ;
a.Close() ;
-
+ return 0;
}
@@ -505,7 +505,7 @@
a.ResetAndDestroy() ;
a.Close() ;
-
+ return 0;
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -1364,6 +1364,7 @@
__UHEAP_MARKEND;
if(ret == KErrArgument)
return KErrNone;
+ return ret;
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp Tue May 11 17:01:36 2010 +0300
@@ -161,7 +161,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
@@ -297,7 +297,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
@@ -408,7 +408,7 @@
a.ResetAndDestroy();
a.Close();
-
+ return 0;
}
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -244,13 +244,6 @@
output->AppendL( responseTypeParam );
}
- else
- {
- delete aListModel;
- aListModel = NULL;
- delete aOperationObserver;
- aOperationObserver = NULL;
- }
// call callback of consumer
@@ -435,7 +428,7 @@
CActiveScheduler :: Stop() ;
return KErrNone;
}
-
+ return KErrNone;
}
// -----------------------------------------------------------------------------
@@ -448,7 +441,7 @@
// Creating the Cleanup stack for this new thread
CTrapCleanup* cleanup = CTrapCleanup::New();
struct ParamPass* arg1 = (ParamPass*) a;
- TInt errorCode;
+ TInt errorCode = KErrNone;
TInt error = KErrNone;
TRAP(error, errorCode = GetFilesAsynchL(a));
delete cleanup;
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tprovidertestobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tprovidertestobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -74,6 +74,7 @@
if(iWait)
iWait->AsyncStop();
+ return 0;
}
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -692,5 +692,5 @@
iFile.Write(_L8("End of observer"));
-
+ return KErrNone;
}
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -123,6 +123,7 @@
User::Leave(KErrNotFound);
}
}
+ return KErrNone;
}
/* --------------------------------------------------------------------------
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp Tue May 11 17:01:36 2010 +0300
@@ -489,15 +489,6 @@
TInt expRes = expValue.AsTInt32();
TInt resRes = resValue.AsTInt32();
- TInt expMax = expRes + 200;
-
- if(aKey == KMgFileSize)
- {
- if(resRes >= expRes && resRes <expMax)
- {
- equal = ETrue;
- }
- }
expIntStr.AppendNum(expRes);
resIntStr.AppendNum(resRes);
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp Tue May 11 17:01:36 2010 +0300
@@ -130,6 +130,7 @@
{
iWaitSchedular->AsyncStop();
}
+ return 0;
}
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -139,6 +139,7 @@
++i;
i++;
//CActiveScheduler::Stop();
+ return 0;
}
};
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertestobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertestobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -68,6 +68,7 @@
if(iWait)
iWait->AsyncStop();
+ return 0;
}
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -260,7 +260,7 @@
else
iResult= KErrGeneral;
-
+ return 0;
}
// -----------------------------------------------------------------------------
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp Tue May 11 17:01:36 2010 +0300
@@ -197,5 +197,5 @@
- return 0;
+// return 0;
}
--- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertestobserver.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertestobserver.cpp Tue May 11 17:01:36 2010 +0300
@@ -68,6 +68,7 @@
if(iWait)
iWait->AsyncStop();
+ return 0;
}
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -135,7 +135,7 @@
if(code != iExpectedError)
{
iResult = KErrGeneral;
- return;
+ return 0;
}
}
@@ -151,7 +151,7 @@
iResult = KErrNone;
}
}
-
+ return 0;
}
TInt CIServiceTestModule::LoadProviderTest(CStifItemParser& aItem)
@@ -513,6 +513,7 @@
Delete();
__UHEAP_MARKEND;
+ return 0;
}
@@ -843,8 +844,8 @@
TLiwVariant resValue;
TBool equal = EFalse;
- TReal expValueReal;
- TReal resValueReal;
+ TReal expValueReal = 0;
+ TReal resValueReal = 0;
if(!aExpectedMap->FindL(aKey, expValue))
{
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -1723,9 +1723,8 @@
interface->Close();
CleanupStack::PopAndDestroy(iServiceHandler);
-
+ __UHEAP_MARKEND;
return result;
- __UHEAP_MARKEND;
}
else
{
@@ -2039,9 +2038,10 @@
CleanupStack::PopAndDestroy( iServiceHandler );
+ __UHEAP_MARKEND;
return result;
- __UHEAP_MARKEND;
+
}
@@ -3803,7 +3803,7 @@
//
TInt Ctsysinfoprovidertests::GetCameraInfoTestNegative(CStifItemParser& aItem)
{
- TInt retcode;
+ TInt retcode = 0;
iLog->Log(_L("GetCameraInfoTest - Negative Test") );
__UHEAP_MARK;
@@ -3976,7 +3976,7 @@
TInt Ctsysinfoprovidertests::GetCameraInfoNegEntity(CStifItemParser& aItem)
{
_LIT8(KEntity1, "Entity1");
- TInt retcode;
+ TInt retcode = 0;
iLog->Log(_L("GetCameraInfoNegEntity - Negative Test") );
__UHEAP_MARK;
@@ -4136,7 +4136,7 @@
TInt Ctsysinfoprovidertests::GetCameraInfoNegKey(CStifItemParser& aItem)
{
_LIT8(KKey1, "Key1");
- TInt retcode;
+ TInt retcode = 0;
iLog->Log(_L("GetCameraInfoNegKey - Negative Test") );
__UHEAP_MARK;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp Tue May 11 17:01:36 2010 +0300
@@ -363,8 +363,8 @@
test->Start();
TInt retval = test->Result();
delete test;
+ __UHEAP_MARKEND;
return retval;
- __UHEAP_MARKEND;
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -372,8 +372,8 @@
aLog->Log(_L("after test->Result() Vibra:"));
delete test;
+ __UHEAP_MARKEND;
return retval;
- __UHEAP_MARKEND;
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp Tue May 11 17:01:36 2010 +0300
@@ -195,7 +195,8 @@
TRAPD(err1, interface->ExecuteCmdL(KGetNotification,*inparam,*outparam,KLiwOptASyncronous,this));
iResult = err1;
iLog->Log(_L("after getnotification vibra Active:"));
- TInt pos = 0, transactionid ;
+ TInt pos = 0;
+ TInt transactionid = 0;
const TLiwGenericParam* output2 = outparam->FindFirst( pos,KTransactionId );
iLog->Log(_L("after FindFirst vibra Active:"));
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -160,7 +160,7 @@
else
{
const CLiwMap* outmap = ret_val->Value().AsMap();
- const CLiwList* drvlist;
+ const CLiwList* drvlist = NULL;
TLiwVariant variant_drvlist;
if( outmap->FindL(KDriveList,variant_drvlist) )
@@ -251,7 +251,7 @@
else
{
const CLiwMap* outmap = ret_val->Value().AsMap();
- const CLiwList* drvlist;
+ const CLiwList* drvlist = NULL;
TLiwVariant variant_drvlist;
if( outmap->FindL(KDriveList,variant_drvlist) )
@@ -2718,9 +2718,9 @@
interface->Close();
CleanupStack::PopAndDestroy(iServiceHandler);
-
+ __UHEAP_MARKEND;
return result;
- __UHEAP_MARKEND;
+
}
else
{
@@ -3015,10 +3015,10 @@
interface->Close();
CleanupStack::PopAndDestroy( iServiceHandler );
-
+ __UHEAP_MARKEND;
return result;
- __UHEAP_MARKEND;
+
}
@@ -3324,7 +3324,7 @@
//
TInt Ctsysinfoprovidertests::GetCameraInfoTest(CStifItemParser& aItem)
{
- TInt retcode;
+ TInt retcode = 0;
iLog->Log(_L("GetCameraInfoTest - Positive Test") );
__UHEAP_MARK;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp Tue May 11 17:01:36 2010 +0300
@@ -325,8 +325,9 @@
test->Start();
TInt retval = test->Result();
delete test;
+ __UHEAP_MARKEND;
return retval;
- __UHEAP_MARKEND;
+
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfoflipstatus.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfoflipstatus.cpp Tue May 11 17:01:36 2010 +0300
@@ -124,12 +124,18 @@
CSysData* data1 = NULL;
TRAPD(err2,iSysInfoService->GetInfoL(KGeneral,KFlipStatus,data1));
+ iResult = err2;
+ if(err2 != KErrNone)
+ return;
flipstatus = ((CStatus*)data1)->Status();
CStatus* data2 = CStatus::NewL(!flipstatus);
TRAPD(err3,iSysInfoService->SetInfoL(KGeneral,KFlipStatus,data2));
+ iResult = err3;
+ if( err3 != KErrNone )
+ return;
delete data1;
delete data2;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogripstatus.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogripstatus.cpp Tue May 11 17:01:36 2010 +0300
@@ -125,12 +125,17 @@
CSysData* data1 = NULL;
TRAPD(err2,iSysInfoService->GetInfoL(KGeneral,KGripStatus,data1));
-
+ iResult = err2;
+ if( err2 != KErrNone )
+ return;
gripstatus = ((CStatus*)data1)->Status();
CStatus* data2 = CStatus::NewL(!gripstatus);
TRAPD(err3,iSysInfoService->SetInfoL(KGeneral,KGripStatus,data2));
+ iResult = err3;
+ if( err3 != KErrNone )
+ return;
delete data1;
delete data2;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tuseractivitynotifier.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tuseractivitynotifier.cpp Tue May 11 17:01:36 2010 +0300
@@ -55,8 +55,8 @@
CTestUserActivity::CTestUserActivity(CStifLogger* aLog,TInt aTimeOut,
Test_Type aType) :
CActive(EPriorityStandard),
+ iInactivityTimeOut(aTimeOut),
iLog(aLog),
- iInactivityTimeOut(aTimeOut),
iTestType(aType)
{
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidasync.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidasync.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CCellidAsync::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(60000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 333;
TRAPD(err ,iSysInfoService->GetInfoL(KNetwork,KCellID,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidnotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidnotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CCellidNotify::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 444;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCellID,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworkasync.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworkasync.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CCurrentNetAsync::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 5555;
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KCurrentNetwork,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworknotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworknotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CCurrentNetNotify::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 6666;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCurrentNetwork,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworkasync.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworkasync.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CHomeNwAsync::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 1;
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KHomeNetwork,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworknotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworknotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CHomeNetworkNotify::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 222;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCurrentNetwork,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacasync.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacasync.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CLacAsync::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 7777;
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KLocationArea,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacnotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacnotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CLacNotify::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 8888;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KLocationArea,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworkmodenotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworkmodenotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CNetModeNotify::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KNetworkMode,111,this));
iResult = err;
iTimer->After(OneMinute);
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinforegstatusnotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinforegstatusnotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CRegStatusNotify::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
TRAPD(err ,iSysInfoService->GetNotificationL(KNetwork,KRegistrationStatus,9999,this));
iResult = err ;
iTimer->After(OneMinute);
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelasync.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelasync.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CSigLevelAsync::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 3333;
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KSignalLevel,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelnotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelnotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CSigLevelNotify::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
iTransId = 4444;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KSignalLevel,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthasyn.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthasyn.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CSignalStrAsync::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KSignalStrength,1111,this));
iResult = err;
iTimer->After(OneMinute);
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthnotify.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthnotify.cpp Tue May 11 17:01:36 2010 +0300
@@ -81,7 +81,8 @@
void CSignalStrNotify::TestFuncL()
{
- const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
+ TInt64 x = 6000000000;
+ const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KSignalStrength,2222,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp Tue Apr 27 17:33:05 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp Tue May 11 17:01:36 2010 +0300
@@ -2366,7 +2366,7 @@
{
TInt result = KErrNone;
- TInt newDisplayLang;
+ TInt newDisplayLang = 0;
__UHEAP_MARK;