equal
deleted
inserted
replaced
80 { |
80 { |
81 TInt res; |
81 TInt res; |
82 // General note: trap the error because this is not a leaving function |
82 // General note: trap the error because this is not a leaving function |
83 // and generating an error will not help |
83 // and generating an error will not help |
84 |
84 |
85 // store the backup file out |
85 if (iIntegrityService) |
86 TRAP(res, StoreBackupL()); |
86 { |
87 if (res != KErrNone) |
87 // store the backup file out |
88 { |
88 TRAP(res, StoreBackupL()); |
89 DEBUG_PRINTF2(_L8("Sis Registry Server - Failed to store backup (failure code: %d.)"), res); |
89 if (res != KErrNone) |
90 } |
90 { |
91 |
91 DEBUG_PRINTF2(_L8("Sis Registry Server - Failed to store backup (failure code: %d.)"), res); |
92 // integrity service operation committing point |
92 } |
93 TRAP(res, iIntegrityService->CommitL()); |
93 |
94 if (res != KErrNone) |
94 // integrity service operation committing point |
95 { |
95 TRAP(res, iIntegrityService->CommitL()); |
96 DEBUG_PRINTF2(_L8("Sis Registry Server - Failed to commit integrity services changes (failure code %d.)"), res); |
96 if (res != KErrNone) |
97 } |
97 { |
98 |
98 DEBUG_PRINTF2(_L8("Sis Registry Server - Failed to commit integrity services changes (failure code %d.)"), res); |
|
99 } |
|
100 } |
|
101 |
99 delete iBackupFile; |
102 delete iBackupFile; |
100 |
103 |
101 delete iIntegrityService; |
104 delete iIntegrityService; |
102 delete iSisRegLangMonitor; |
105 delete iSisRegLangMonitor; |
103 CleanUp(); |
106 CleanUp(); |
444 { |
447 { |
445 DEBUG_PRINTF(_L8("Sis Registry Server - Registry file does not match entry directory. Corrupt.")); |
448 DEBUG_PRINTF(_L8("Sis Registry Server - Registry file does not match entry directory. Corrupt.")); |
446 User::Leave(KErrCorrupt); |
449 User::Leave(KErrCorrupt); |
447 } |
450 } |
448 |
451 |
449 iTokens.Append(token); |
452 iTokens.AppendL(token); |
450 CleanupStack::Pop(token); |
453 CleanupStack::Pop(token); |
451 CleanupStack::PopAndDestroy(&fileStream); |
454 CleanupStack::PopAndDestroy(&fileStream); |
452 |
455 |
453 } |
456 } |
454 |
457 |
1415 RArray<TInt>& aDriveList) |
1418 RArray<TInt>& aDriveList) |
1416 { |
1419 { |
1417 CleanupClosePushL(aDriveList); |
1420 CleanupClosePushL(aDriveList); |
1418 aDriveList.Reset(); |
1421 aDriveList.Reset(); |
1419 // a copy of the controller is always kept on drive C |
1422 // a copy of the controller is always kept on drive C |
1420 aDriveList.Append(iSystemDrive); |
1423 aDriveList.AppendL(iSystemDrive); |
1421 |
1424 |
1422 // only controllers will be written to removable media and |
1425 // only controllers will be written to removable media and |
1423 // we have now to check for those |
1426 // we have now to check for those |
1424 TUint installationDrives = aObject.Drives(); |
1427 TUint installationDrives = aObject.Drives(); |
1425 TUint fixedDrives = FixedDrives(); |
1428 TUint fixedDrives = FixedDrives(); |