equal
deleted
inserted
replaced
216 TIniFileHelper::NextLine( defaultMeta, line); |
216 TIniFileHelper::NextLine( defaultMeta, line); |
217 |
217 |
218 //try to create RangeMeta data |
218 //try to create RangeMeta data |
219 TLex lex( line); |
219 TLex lex( line); |
220 CRangeMeta * rangeMeta = CRangeMeta::NewL( lex); |
220 CRangeMeta * rangeMeta = CRangeMeta::NewL( lex); |
221 |
221 CleanupStack::PushL(rangeMeta); |
|
222 |
222 //if the line content is not a range meta data check is the content is it default meta data |
223 //if the line content is not a range meta data check is the content is it default meta data |
223 if ( rangeMeta) |
224 if ( rangeMeta) |
224 { |
225 { |
225 iRangeMetas.AppendL( rangeMeta); |
226 iRangeMetas.AppendL( rangeMeta); |
226 } |
227 } |
230 { |
231 { |
231 User::LeaveIfError( TIniFileHelper::ReadUNumber( iDefaultMeta, lex)); |
232 User::LeaveIfError( TIniFileHelper::ReadUNumber( iDefaultMeta, lex)); |
232 User::LeaveIfError( !lex.Eos()); |
233 User::LeaveIfError( !lex.Eos()); |
233 } |
234 } |
234 } |
235 } |
235 |
236 CleanupStack::Pop(rangeMeta); //rangeMeta |
|
237 |
236 } while ( defaultMeta.Length()); |
238 } while ( defaultMeta.Length()); |
237 |
239 |
238 } |
240 } |
239 |
241 |
240 |
242 |
265 break; |
267 break; |
266 } |
268 } |
267 |
269 |
268 TLex lex( sectionPtr); |
270 TLex lex( sectionPtr); |
269 CRangeSetting* rangeSetting = CRangeSetting::NewL( lex); |
271 CRangeSetting* rangeSetting = CRangeSetting::NewL( lex); |
|
272 CleanupStack::PushL(rangeSetting); |
270 |
273 |
271 if ( rangeSetting ) |
274 if ( rangeSetting ) |
272 { |
275 { |
273 iRangeSettings.AppendL( rangeSetting); |
276 iRangeSettings.AppendL( rangeSetting); |
274 } |
277 } |
275 else |
278 else |
276 { |
279 { |
277 CDefaultSetting* defaultSetting = CDefaultSetting::NewL( lex); |
280 CDefaultSetting* defaultSetting = CDefaultSetting::NewL( lex); |
|
281 CleanupStack::PushL(defaultSetting); |
278 |
282 |
279 if ( defaultSetting ) |
283 if ( defaultSetting ) |
280 { |
284 { |
281 if ( iDefaultSetting && iDefaultSetting->ContainsSecuritySettings()) |
285 if ( iDefaultSetting && iDefaultSetting->ContainsSecuritySettings()) |
282 { |
286 { |
292 else |
296 else |
293 { |
297 { |
294 //line contains invalid format -> Corrupted |
298 //line contains invalid format -> Corrupted |
295 User::Leave( KErrCorrupt); |
299 User::Leave( KErrCorrupt); |
296 } |
300 } |
297 } |
301 CleanupStack::Pop(defaultSetting); //defaultSetting |
298 |
302 } |
|
303 CleanupStack::Pop(rangeSetting); //rangeSetting |
299 |
304 |
300 } while ( platSecPtr.Length()); |
305 } while ( platSecPtr.Length()); |
301 |
306 |
302 iContentPtr.Set( iContentPtr.Mid( index + IniConstants::KMainSectionStringLength)); |
307 iContentPtr.Set( iContentPtr.Mid( index + IniConstants::KMainSectionStringLength)); |
303 } |
308 } |
658 { |
663 { |
659 break; |
664 break; |
660 } |
665 } |
661 |
666 |
662 CIndividualSetting * setting = CIndividualSetting::NewL( lex); |
667 CIndividualSetting * setting = CIndividualSetting::NewL( lex); |
663 |
668 CleanupStack::PushL(setting); |
|
669 |
664 if ( setting ) |
670 if ( setting ) |
665 { |
671 { |
666 //add settting to settings list |
672 //add settting to settings list |
667 AddIndividualSettingL( setting); |
673 AddIndividualSettingL( setting); |
668 } |
674 } |
669 else |
675 else |
670 { |
676 { |
671 //file is corrupted if setting is not valid |
677 //file is corrupted if setting is not valid |
672 User::Leave( KErrCorrupt); |
678 User::Leave( KErrCorrupt); |
673 } |
679 } |
674 |
680 CleanupStack::Pop(setting); //setting |
|
681 |
675 //repeat until contetn left |
682 //repeat until contetn left |
676 } while ( iContentPtr.Length()); |
683 } while ( iContentPtr.Length()); |
677 } |
684 } |
678 |
685 |
679 |
686 |
1668 RDEBUG_2("CentRepTool: Single policies (count %d)", countUint32); |
1675 RDEBUG_2("CentRepTool: Single policies (count %d)", countUint32); |
1669 |
1676 |
1670 for ( TInt i = 0; i < countUint32; i++) |
1677 for ( TInt i = 0; i < countUint32; i++) |
1671 { |
1678 { |
1672 CIndividualSetting* singlePolicy = new(ELeave) CIndividualSetting(); |
1679 CIndividualSetting* singlePolicy = new(ELeave) CIndividualSetting(); |
|
1680 CleanupStack::PushL(singlePolicy); |
1673 singlePolicy->InternalizePlatSecL( aStream); |
1681 singlePolicy->InternalizePlatSecL( aStream); |
1674 AddIndividualSettingL( singlePolicy); |
1682 AddIndividualSettingL( singlePolicy); |
|
1683 CleanupStack::Pop(singlePolicy); //singlePolicy |
1675 } |
1684 } |
1676 |
1685 |
1677 //read range policies |
1686 //read range policies |
1678 TInt32 countInt32; |
1687 TInt32 countInt32; |
1679 aStream >> countInt32; |
1688 aStream >> countInt32; |
1681 RDEBUG_2("CentRepTool: Range policies (count %d)", countInt32); |
1690 RDEBUG_2("CentRepTool: Range policies (count %d)", countInt32); |
1682 |
1691 |
1683 for ( TInt i = 0; i < countInt32; i++) |
1692 for ( TInt i = 0; i < countInt32; i++) |
1684 { |
1693 { |
1685 CRangeSetting* rangePolicy = new(ELeave) CRangeSetting(); |
1694 CRangeSetting* rangePolicy = new(ELeave) CRangeSetting(); |
|
1695 CleanupStack::PushL(rangePolicy); |
1686 aStream >> *rangePolicy; |
1696 aStream >> *rangePolicy; |
1687 User::LeaveIfError( iRangeSettings.Append( rangePolicy)); |
1697 User::LeaveIfError( iRangeSettings.Append( rangePolicy)); |
|
1698 CleanupStack::Pop(rangePolicy); //rangePolicy |
1688 } |
1699 } |
1689 |
1700 |
1690 |
1701 |
1691 //read default policies (read and write)... |
1702 //read default policies (read and write)... |
1692 RDEBUG("CentRepTool: Default policies"); |
1703 RDEBUG("CentRepTool: Default policies"); |
1701 RDEBUG_2("CentRepTool: Range metadata (count %d)", countInt32); |
1712 RDEBUG_2("CentRepTool: Range metadata (count %d)", countInt32); |
1702 |
1713 |
1703 for ( TInt i = 0; i < countInt32; i++) |
1714 for ( TInt i = 0; i < countInt32; i++) |
1704 { |
1715 { |
1705 CRangeMeta* rangeMeta = new(ELeave) CRangeMeta(); |
1716 CRangeMeta* rangeMeta = new(ELeave) CRangeMeta(); |
|
1717 CleanupStack::PushL(rangeMeta); |
1706 aStream >> (*rangeMeta); |
1718 aStream >> (*rangeMeta); |
1707 User::LeaveIfError( iRangeMetas.Append( rangeMeta)); |
1719 User::LeaveIfError( iRangeMetas.Append( rangeMeta)); |
|
1720 CleanupStack::Pop(rangeMeta); //rangeMeta |
1708 } |
1721 } |
1709 |
1722 |
1710 //read time stamp |
1723 //read time stamp |
1711 TInt64 timeStampInt ; |
1724 TInt64 timeStampInt ; |
1712 aStream >> timeStampInt ; |
1725 aStream >> timeStampInt ; |