diff -r fdcef27a50b8 -r 24127ea5a236 accessoryservices/accessoryserver/src/Server/AccSrvASYProxyHandler.cpp --- a/accessoryservices/accessoryserver/src/Server/AccSrvASYProxyHandler.cpp Wed Sep 15 13:36:47 2010 +0300 +++ b/accessoryservices/accessoryserver/src/Server/AccSrvASYProxyHandler.cpp Wed Oct 13 15:58:37 2010 +0300 @@ -127,7 +127,7 @@ } else { - trID = StoreTransactionIDL( aCmdId, aASYCommand, aPtrBuf ); + trID = StoreTransactionID( aCmdId, aASYCommand, aPtrBuf ); } COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::HandleASYCommsL - return TrID=%d", trID ); @@ -135,22 +135,22 @@ } // ----------------------------------------------------------------------------- -// CAccSrvASYProxyHandler::StoreTransactionIDL +// CAccSrvASYProxyHandler::StoreTransactionID // ----------------------------------------------------------------------------- // -TInt CAccSrvASYProxyHandler::StoreTransactionIDL( +TInt CAccSrvASYProxyHandler::StoreTransactionID( TProcessCmdId aCmdId, TASYCommandParamRecord& aASYCommand, TPtr8* aPtrBuf ) { - COM_TRACE_( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL()" ); + COM_TRACE_( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID()" ); TInt trID( KErrNotFound ); TInt count( iOngoingTransactions.Count() ); TUint32 nameFromOngoingTransactions; TUint32 nameFromRequest; - COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL - current count = %d", count ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID - current count = %d", count ); for ( TInt i( 0 ); i < count; ++i ) { @@ -163,7 +163,7 @@ { //Same command is under processing in ASY -> use existing trid trID = iOngoingTransactions.operator[](i).iTransactionID; - COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL - found trid = %d", trID ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID - found trid = %d", trID ); break; } else @@ -180,7 +180,7 @@ trIDRecord.iNameRecord = aASYCommand.iNameRecord; trIDRecord.iCommand = aASYCommand.iCmdValue; trIDRecord.iTransactionID = trID; - iOngoingTransactions.AppendL( trIDRecord ); + iOngoingTransactions.Append( trIDRecord ); //Complete outstanding NotifyProcessCommand() TRAP_IGNORE( iConnectionController->NotificationQueue().CompleteASYCmdL( @@ -196,7 +196,7 @@ //This means also that ASY is not informed about this command. } - COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL - return %d", trID ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID - return %d", trID ); return trID; } @@ -217,7 +217,7 @@ if ( iOngoingTransactions.operator[]( i ).iTransactionID == aTransactionID ) { iOngoingTransactions.Remove( i ); - COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionIDL - removed index = %d",i ); + COM_TRACE_1( "[AccFW:AccServer] CAccSrvASYProxyHandler::StoreTransactionID - removed index = %d",i ); break; } else