--- 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;