mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TimeoutController.cpp
--- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TimeoutController.cpp Wed Apr 14 16:29:54 2010 +0300
+++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TimeoutController.cpp Tue Apr 27 17:11:02 2010 +0300
@@ -175,7 +175,7 @@
miliseconds /= 1000;
TBuf<30> dateString;
- TRAPD(ignore, endTime.FormatL(dateString, KFormatTimeStamp));
+ TRAP_IGNORE(endTime.FormatL(dateString, KFormatTimeStamp));
iLog->Log(_L("Timer=%LD ms, EndTime=%S"), miliseconds, &dateString);
// Store absolute timeout
@@ -248,9 +248,7 @@
{
if (iTestCaseTimeout > timeout)
{
- RDebug::Print(
- _L("Absolute timer still valid. Restaring timer. iStatus: %d"),
- iStatus.Int());
+ RDebug::Print(_L("Absolute timer still valid. Restaring timer. iStatus: %d"), iStatus.Int());
// Start new timer
iStatus = KErrNone; // reset value
iTimer.At(iStatus, iTestCaseTimeout); // restart timer