--- a/brandingserver/bsserver/cbsstoragemanager.cpp Thu Aug 19 10:14:19 2010 +0300
+++ b/brandingserver/bsserver/cbsstoragemanager.cpp Tue Aug 31 15:31:29 2010 +0300
@@ -2,7 +2,7 @@
* Copyright (c) 2006-2006 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
@@ -11,11 +11,12 @@
*
* Contributors:
*
-* Description: Stores element data and writes it to stream
+* Description: Stores element data and writes it to stream
*
*/
+
#include <s32strm.h>
#include <s32file.h>
#include <f32file.h>
@@ -34,7 +35,7 @@
#include "cbssession.h"
#include "mbsupdater.h"
//#include "importlogwriter.h"
-#include "debugtrace.h"
+#include "DebugTrace.h"
// ======== MEMBER FUNCTIONS ========
@@ -266,6 +267,7 @@
langBuf.Length() + KDot().Length() * 3 + KMaxVersionLenght;
fileName = HBufC::NewLC( length );
+ if(fileName){
TPtr file( fileName->Des() );
// [application_id]\[brand_id]\[def_filename][language_id]
@@ -285,11 +287,9 @@
file.Append( KDot() );
file.Append( versionBuffer );
}
-
- if( fileName )
- {
- CleanupStack::Pop( fileName );
- }
+
+ CleanupStack::Pop( fileName );
+ }
return fileName;
}
@@ -900,9 +900,6 @@
CDir* directories = NULL;
User::LeaveIfError( iFs.GetDir( driveAndPath, KEntryAttNormal, ESortByName, files, directories ) );
-
- CleanupStack :: PushL (files);
- CleanupStack :: PushL (directories);
TInt count = files->Count();
for( TInt i = 0; i < count; i++ )
@@ -940,10 +937,7 @@
}
CleanupStack::PopAndDestroy( fullName );
}
-
- CleanupStack :: PopAndDestroy (directories);
- CleanupStack :: PopAndDestroy (files);
- CleanupStack :: PopAndDestroy (nameWithDrive);
+ CleanupStack::PopAndDestroy( nameWithDrive );
}
TRACE( T_LIT( "CBSStorageManager::CleanupFileL end") );
}