equal
deleted
inserted
replaced
337 { |
337 { |
338 if ( MdsUtils::Compare( iFileName, *(iCreatedFiles[i]) ) == 0 ) |
338 if ( MdsUtils::Compare( iFileName, *(iCreatedFiles[i]) ) == 0 ) |
339 { |
339 { |
340 fileEventType = EMdsFileCreated; |
340 fileEventType = EMdsFileCreated; |
341 delete iCreatedFiles[i]; |
341 delete iCreatedFiles[i]; |
342 iCreatedFiles[i] = NULL; |
|
343 iCreatedFiles.Remove( i ); |
342 iCreatedFiles.Remove( i ); |
344 |
343 |
345 //Have to check whether file has been hidden |
344 //Have to check whether file has been hidden |
346 RFsPlugin fsPlugin( aRequest ); |
345 RFsPlugin fsPlugin( aRequest ); |
347 const TInt rfsPluginError( fsPlugin.Connect() ); |
346 const TInt rfsPluginError( fsPlugin.Connect() ); |
432 for ( TInt i = iModifiedFiles.Count(); --i >= 0; ) |
431 for ( TInt i = iModifiedFiles.Count(); --i >= 0; ) |
433 { |
432 { |
434 if ( MdsUtils::Compare( iFileName, *(iModifiedFiles[i]) ) == 0 ) |
433 if ( MdsUtils::Compare( iFileName, *(iModifiedFiles[i]) ) == 0 ) |
435 { |
434 { |
436 delete iModifiedFiles[i]; |
435 delete iModifiedFiles[i]; |
437 iModifiedFiles[i] = NULL; |
|
438 iModifiedFiles.Remove( i ); |
436 iModifiedFiles.Remove( i ); |
439 found = ETrue; |
437 found = ETrue; |
440 } |
438 } |
441 } |
439 } |
442 |
440 |
495 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - EFsFormatSubClose" ); |
493 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - EFsFormatSubClose" ); |
496 if ( iFormatDriveNumber < 0 ) |
494 if ( iFormatDriveNumber < 0 ) |
497 { |
495 { |
498 return KErrNone; |
496 return KErrNone; |
499 } |
497 } |
500 drvNumber = iFormatOldMediaId; |
498 drvNumber = iFormatDriveNumber; |
501 volInfo.iUniqueID = iFormatOldMediaId; |
499 volInfo.iUniqueID = iFormatOldMediaId; |
502 iFormatOldMediaId = 0; |
500 iFormatOldMediaId = 0; |
503 iFormatDriveNumber = -1; |
501 iFormatDriveNumber = -1; |
504 fileEventType = EMdsDriveFormatted; |
502 fileEventType = EMdsDriveFormatted; |
505 if ( processId.iUid == 0 ) |
503 if ( processId.iUid == 0 ) |
544 queueItem->iFileName = iFileName.AllocL(); |
542 queueItem->iFileName = iFileName.AllocL(); |
545 queueItem->iNewFileName = iNewFileName.AllocL(); |
543 queueItem->iNewFileName = iNewFileName.AllocL(); |
546 queueItem->iFileEventType = fileEventType; |
544 queueItem->iFileEventType = fileEventType; |
547 queueItem->iProcessId = processId; |
545 queueItem->iProcessId = processId; |
548 |
546 |
549 iQueue.AppendL( queueItem ); // owenership is transferred |
547 iQueue.AppendL( queueItem ); // ownership is transferred |
550 CleanupStack::Pop( queueItem ); |
548 CleanupStack::Pop( queueItem ); |
551 err = KErrNone; |
549 err = KErrNone; |
552 iPendingEvents++; |
550 iPendingEvents++; |
553 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - added to queue" ); |
551 WRITELOG( "CMdsFileServerPlugin::DoRequestL() - added to queue" ); |
554 } |
552 } |