FCL/sf/mw/mds: comparison harvester/blacklistclient/src/blacklistclient.cpp

equal deleted inserted replaced

-:646a02f170b9
+:3cebc1a84278
 // RBlacklistClient::~RBlacklistClient()
 // ---------------------------------------------------------------------------
 //
 EXPORT_C RBlacklistClient::~RBlacklistClient()
 {
-WRITELOG( "CBlacklistServer::~RBlacklistClient - begin" );
+WRITELOG( "RBlacklistClient::~RBlacklistClient - begin" );
 RSessionBase::Close();
 iBlacklistMemoryTable.ResetAndDestroy();
 iBlacklistMemoryTable.Close();
 	iBlacklistChunk.Close();
-WRITELOG( "CBlacklistServer::~RBlacklistClient - end" );
+WRITELOG( "RBlacklistClient::~RBlacklistClient - end" );
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::Connect()
 // ---------------------------------------------------------------------------
 //
 EXPORT_C TInt RBlacklistClient::Connect()
 {
-WRITELOG( "CBlacklistServer::Connect - begin" );
+WRITELOG( "RBlacklistClient::Connect - begin" );
 TInt retryCount = 2;
 TInt error = KErrNone;
 iSessionOk = EFalse;
 }
 --retryCount;
 }
-WRITELOG( "CBlacklistServer::Connect - end" );
+WRITELOG( "RBlacklistClient::Connect - end" );
 return error;
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::Version()
 // ---------------------------------------------------------------------------
 //
 TVersion RBlacklistClient::Version() const
 {
-WRITELOG( "CBlacklistServer::Version - begin" );
+WRITELOG( "RBlacklistClient::Version - begin" );
 return TVersion( KBlacklistServerMajorVersion, KBlacklistServerMinorVersion,
 	KBlacklistServerBuildVersion );
 }
 // RBlacklistClient::StartServer()
 // ---------------------------------------------------------------------------
 //
 TInt RBlacklistClient::StartServer()
 {
-WRITELOG( "CBlacklistServer::CustomSecurityCheckL - begin" );
+WRITELOG( "RBlacklistClient::CustomSecurityCheckL - begin" );
 const TUidType serverUid = ( KNullUid, KNullUid, KUidKBlacklistServer );
 RProcess server;
 TInt error = server.Create( KBlacklistServerExe, KNullDesC );
 User::WaitForRequest( status );
 error = server.ExitType() == EExitPanic ? KErrGeneral : status.Int();
 server.Close();
-WRITELOG( "CBlacklistServer::Version - end" );
+WRITELOG( "RBlacklistClient::Version - end" );
 return error;
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::RemoveFromDBL()
 // ---------------------------------------------------------------------------
 //
 void RBlacklistClient::RemoveFromDBL( const TDesC& aUri, TUint32 aMediaId ) const
 {
-WRITELOG( "CBlacklistServer::RemoveFromDBL - begin" );
+WRITELOG( "RBlacklistClient::RemoveFromDBL - begin" );
 TPckgBuf<TUint32> mediaIdPckg( aMediaId );
 TIpcArgs ipcArgs;
 ipcArgs.Set( 1, &aUri );
 ipcArgs.Set( 2, &mediaIdPckg );
 const TInt err = SendReceive( EBlacklistRemoveFromDB, ipcArgs );
 User::LeaveIfError( err );
-WRITELOG( "CBlacklistServer::RemoveFromDBL - end" );
+WRITELOG( "RBlacklistClient::RemoveFromDBL - end" );
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::DoLoadBlacklistL()
 // ---------------------------------------------------------------------------
 //
 void RBlacklistClient::DoLoadBlacklistL( TInt& aHandle ) const
 {
-WRITELOG( "CBlacklistServer::DoLoadBlacklistL - begin" );
+WRITELOG( "RBlacklistClient::DoLoadBlacklistL - begin" );
 TPckgBuf<TInt> handleBuf;
 TIpcArgs ipcArgs;
 ipcArgs.Set( 1, &handleBuf );
 const TInt err = SendReceive( EGetBlacklistData, ipcArgs );
 User::LeaveIfError( err );
 aHandle = handleBuf();
-WRITELOG( "CBlacklistServer::DoLoadBlacklistL - end" );
+WRITELOG( "RBlacklistClient::DoLoadBlacklistL - end" );
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::LoadBlacklistL()
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void RBlacklistClient::LoadBlacklistL()
 {
-WRITELOG( "CBlacklistServer::LoadBlacklistL - begin" );
+WRITELOG( "RBlacklistClient::LoadBlacklistL - begin" );
 if ( !iSessionOk )
 {
 return;
 }
 	TInt64 modified ( 0 );
 	TUint32 mediaId ( 0 );
 HBufC* uri = NULL;
-for( TInt i( 0 ); i < listCount; i++ )
+for( TInt i = listCount - 1; i >=0; i-- )
 {
 // get modified and media id
 	    buffer->ReceiveL( modified );
 	    buffer->ReceiveL( mediaId );
 }
 	CleanupStack::PopAndDestroy( buffer );
 	CleanupStack::PopAndDestroy( name );
-WRITELOG( "CBlacklistServer::LoadBlacklistL - end" );
+WRITELOG( "RBlacklistClient::LoadBlacklistL - end" );
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::AddToMemoryTableL()
 // ---------------------------------------------------------------------------
 //
 void RBlacklistClient::AddToMemoryTableL( const TInt64& aModified,
 const TDesC& aUri, const TUint32 aMediaId )
 {
-WRITELOG( "CBlacklistServer::AddToMemoryTableL - begin" );
+WRITELOG( "RBlacklistClient::AddToMemoryTableL - begin" );
 CBlacklistItem* item = CBlacklistItem::NewL( aModified, aUri, aMediaId );
 const TInt err = iBlacklistMemoryTable.Append( item ); // ownership is transferred
 if ( err != KErrNone )
 {
 delete item;
 }
-WRITELOG( "CBlacklistServer::AddToMemoryTableL - end" );
+WRITELOG( "RBlacklistClient::AddToMemoryTableL - end" );
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::RemoveFromMemoryTableL()
 // ---------------------------------------------------------------------------
 //
 void RBlacklistClient::RemoveFromMemoryTableL( const TDesC& aUri, const TUint32 aMediaId )
 {
-WRITELOG( "CBlacklistServer::RemoveFromMemoryTableL - begin" );
+WRITELOG( "RBlacklistClient::RemoveFromMemoryTableL - begin" );
 const TInt index = GetListIndex( aUri, aMediaId );
 if ( index >= 0 )
 {
 CBlacklistItem* item = iBlacklistMemoryTable[index];
 delete item;
 iBlacklistMemoryTable.Remove( index );
 }
-WRITELOG( "CBlacklistServer::RemoveFromMemoryTableL - end" );
+WRITELOG( "RBlacklistClient::RemoveFromMemoryTableL - end" );
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::IsBlacklistedL()
 // ---------------------------------------------------------------------------
 //
 EXPORT_C TBool RBlacklistClient::IsBlacklistedL( const TDesC& aUri, TUint32 aMediaId, TTime aLastModifiedTime )
 {
-WRITELOG( "CBlacklistServer::IsBlacklistedL - begin" );
+WRITELOG( "RBlacklistClient::IsBlacklistedL - begin" );
 const TInt index = GetListIndex( aUri, aMediaId );
 if ( index >= 0 )
 {
 TInt64 modified( 0 );
 if( modified > 0 )
 {
 if ( modified == aLastModifiedTime.Int64() )
 {
-WRITELOG( "CBlacklistServer::IsBlacklistedL - file is blacklisted, modification time is different" );
+WRITELOG( "RBlacklistClient::IsBlacklistedL - file is blacklisted, modification time is different" );
 return ETrue;
 }
 else
 {
 // file might be different, so remove from blacklist
 RemoveFromDBL( aUri, aMediaId );
 }
 }
 else
 {
-WRITELOG( "CBlacklistServer::IsBlacklistedL - file is blacklisted, no modification time found" );
+WRITELOG( "RBlacklistClient::IsBlacklistedL - file is blacklisted, no modification time found" );
 return ETrue;
 }
 }
-WRITELOG( "CBlacklistServer::IsBlacklistedL - end" );
+WRITELOG( "RBlacklistClient::IsBlacklistedL - end" );
 return EFalse;
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::GetListIndex()
 // ---------------------------------------------------------------------------
 //
 TInt RBlacklistClient::GetListIndex( const TDesC& aUri, TUint32 aMediaId )
 {
-WRITELOG( "CBlacklistServer::GetListIndex - begin" );
+WRITELOG( "RBlacklistClient::GetListIndex - begin" );
 for ( TInt i( 0 ); i < iBlacklistMemoryTable.Count(); ++i )
 {
 if ( iBlacklistMemoryTable[i]->Compare( aUri, aMediaId ) )
 {
 return i;
 }
 }
-WRITELOG( "CBlacklistServer::GetListIndex - end" );
+WRITELOG( "RBlacklistClient::GetListIndex - end" );
 return KErrNotFound;
 }
 // RBlacklistClient::AddL()
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void RBlacklistClient::AddL( const TDesC& aUri, TUint32 aMediaId, TTime aLastModifiedTime ) const
 {
-WRITELOG( "CBlacklistServer::AddL - begin" );
+WRITELOG( "RBlacklistClient::AddL - begin" );
 TPckgC<TUint32> mediaIdPckg( aMediaId );
 TPckgC<TTime> lastModifiedTimePckg( aLastModifiedTime );
 	TIpcArgs ipcArgs;
 ipcArgs.Set( 2, &lastModifiedTimePckg );
 const TInt err = SendReceive( EBlacklistAdd, ipcArgs );
 User::LeaveIfError( err );
-WRITELOG( "CBlacklistServer::AddL - end" );
+WRITELOG( "RBlacklistClient::AddL - end" );
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::RemoveL()
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void RBlacklistClient::RemoveL( const TDesC& aUri, TUint32 aMediaId ) const
 {
-WRITELOG( "CBlacklistServer::RemoveL - begin" );
+WRITELOG( "RBlacklistClient::RemoveL - begin" );
 TPckgBuf<TUint32> mediaIdPckg( aMediaId );
 TIpcArgs ipcArgs;
 ipcArgs.Set( 1, &aUri );
 ipcArgs.Set( 2, &mediaIdPckg );
 const TInt err = SendReceive( EBlacklistRemove, ipcArgs );
 User::LeaveIfError( err );
-WRITELOG( "CBlacklistServer::RemoveL - end" );
+WRITELOG( "RBlacklistClient::RemoveL - end" );
 }
 // ---------------------------------------------------------------------------
 // RBlacklistClient::CloseDBL()
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void RBlacklistClient::CloseDBL()
 {
-WRITELOG( "CBlacklistServer::CloseDBL - begin" );
+WRITELOG( "RBlacklistClient::CloseDBL - begin" );
 if ( !iSessionOk )
 {
 User::Leave( KErrDisconnected );
 }
 else
 {
 Send( EBlacklistCloseDB );
 }
-WRITELOG( "CBlacklistServer::CloseDBL - end" );
+WRITELOG( "RBlacklistClient::CloseDBL - end" );
 }
 // End of File

branch	RCL_3
changeset 15	3cebc1a84278
parent 1	acef663c1218
child 17	50de4d668bb6