--- a/XDMEngine/XdmDeviceManagement/src/xdmdmadapter.cpp Thu Aug 19 10:19:02 2010 +0300
+++ b/XDMEngine/XdmDeviceManagement/src/xdmdmadapter.cpp Tue Aug 31 15:35:50 2010 +0300
@@ -235,18 +235,13 @@
}
Callback().SetResultsL( aResultsRef, *currentList, KNullDesC8 );
Callback().SetStatusL( aStatusRef, retValue );
- CleanupStack::PopAndDestroy( names ); // >>> names
- CleanupStack::PopAndDestroy(); // >>> settingIds
- CleanupStack::PopAndDestroy( currentList ); // >>> currentList
+ CleanupStack::PopAndDestroy( 3, currentList ); // >>> settingIds, names, currentList
return;
}
// ./OMA_XDM/X
if( NSmlDmURI::NumOfURISegs( aUri ) == KXdmDmLevel )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::ChildURIListL(): /OMA_XDM/X") );
-#endif
segmentName.Copy( KXdmDmAppId );
currentList->InsertL( currentList->Size(), segmentName );
currentList->InsertL( currentList->Size(), KXdmDmSeparator );
@@ -283,9 +278,6 @@
// ./OMA_XDM/X/ToConRef
else if ( Match( lastUriSeg, KXdmDmToConRef ) )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::ChildURIListL(): /OMA_XDM/X/ToConRef") );
-#endif
segmentName.Copy( KXdmDmSip );
currentList->InsertL( currentList->Size(), segmentName );
currentList->InsertL( currentList->Size(), KXdmDmSeparator );
@@ -298,9 +290,6 @@
// ./OMA_XDM/X/ToConRef/SIP
else if( Match( lastUriSeg, KXdmDmSip ) )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::ChildURIListL(): /OMA_XDM/X/ToConRef/SIP") );
-#endif
segmentName.Copy( KXdmDmConRef );
currentList->InsertL( currentList->Size(), segmentName );
currentList->InsertL( currentList->Size(), KXdmDmSeparator );
@@ -309,9 +298,6 @@
// ./OMA_XDM/X/ToConRef/TO-NAPID
else if( Match ( lastUriSeg, KXdmDmToNapId ) )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::ChildURIListL(): /OMA_XDM/X/ToConRef/TO-NAPID") );
-#endif
segmentName.Copy( KXdmDmConRef );
currentList->InsertL( currentList->Size(), segmentName );
currentList->InsertL( currentList->Size(), KXdmDmSeparator );
@@ -319,9 +305,6 @@
else
{
// if none of asked nodes found return error.
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::ChildURIListL(): return ENotFound") );
-#endif
retValue = CSmlDmAdapter::ENotFound;
}
@@ -519,9 +502,6 @@
{
#ifdef _DEBUG
WriteToLog(_L8("CXdmDMAdapter::UpdateLeafObjectL(): begin") );
- WriteToLog(_L8("CXdmDMAdapter::UpdateLeafObjectL() - aUri: %S"), &aUri );
- WriteToLog(_L8("CXdmDMAdapter::UpdateLeafObjectL() - aLUID: %S"), &aLUID );
- WriteToLog(_L8("CXdmDMAdapter::UpdateLeafObjectL() - aObject: %S"), &aObject );
#endif
CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
@@ -541,9 +521,6 @@
HBufC* current = NULL;
TInt error( KErrNone );
TRAP( error, ( current = TXdmSettingsApi::PropertyL( settingsId, EXdmPropName ) ) );
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UpdateLeafObjectL() - EXdmPropName error: %d"), error );
-#endif
if ( error == KErrNone )
{
TBool same ( EFalse );
@@ -553,20 +530,16 @@
{
same = ETrue;
}
- CleanupStack::PopAndDestroy( current8 ); // >>> current8
- CleanupStack::PopAndDestroy( current ); // >>> current
+ CleanupStack::PopAndDestroy( 2, current8 ); // >>> current, current8
if ( same )
{
Callback().SetStatusL( aStatusRef, status );
- return; // value was same, just return without change
+ return;
}
}
// if the name is already in use, new name with index is created
HBufC* value = CheckExistingNamesLC( aObject ); // << value
TRAP( error, TXdmSettingsApi::UpdatePropertyL( settingsId, *value, EXdmPropName ) );
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UpdateLeafObjectL() - EXdmPropName error: %d"), error );
-#endif
CleanupStack::PopAndDestroy( value ); // >>> value
if ( error != KErrNone )
{
@@ -674,33 +647,14 @@
TInt id = TXdmSettingsApi::CreateCollectionL( *collection );
HBufC8* luid = IntToDes8LC( id ); // << luid
Callback().SetMappingL( aUri, *luid );
- status = CSmlDmAdapter::EOk;
+ CleanupStack::PopAndDestroy( 2, luid ); // >>> collection, luid
+ status = CSmlDmAdapter::EOk;
#ifdef _DEBUG
WriteToLog(_L8("CXdmDMAdapter::AddNodeObjectL(): Settings created id=%d"), id );
#endif
- HBufC8* nameUri = HBufC8::NewLC( aUri.Length() +
- KXdmDmSeparator().Length() +
- KXdmDmName().Length() );
- TPtr8 nameUriPtr = nameUri->Des();
- nameUriPtr.Append( aUri );
- nameUriPtr.Append( KXdmDmSeparator );
- nameUriPtr.Append( KXdmDmName );
-
- // Update Node's NAME to default so UI can recognize settings
- UpdateLeafObjectL( nameUriPtr,
- *luid,
- KXdmDefaultSettingsName,
- KXdmDmName,
- aStatusRef );
- CleanupStack::PopAndDestroy( nameUri ); // >> nameUri
- CleanupStack::PopAndDestroy( luid ); // >> luid
- CleanupStack::PopAndDestroy( collection ); // >> collection
}
- else
- {
- Callback().SetStatusL( aStatusRef, status );
- }
-
+ Callback().SetStatusL( aStatusRef, status );
+
#ifdef _DEBUG
WriteToLog(_L8("CXdmDMAdapter::AddNodeObjectL(): end") );
#endif
@@ -749,9 +703,6 @@
const TDesC8& /*aType*/,
const TInt aStatusRef )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UpdateLeafObjectL( ): begin / end") );
-#endif
// Update from stream not used
Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
}
@@ -766,9 +717,6 @@
const TDesC8& /*aType*/,
const TInt aStatusRef )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::ExecuteCommandL( ): Not supported") );
-#endif
// Not supported
Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
}
@@ -783,9 +731,6 @@
const TDesC8& /*aType*/,
const TInt aStatusRef )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::ExecuteCommandL( ): Not supported") );
-#endif
// Not supported
Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
}
@@ -801,9 +746,6 @@
const TDesC8& /*aType*/,
TInt aStatusRef )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::CopyCommandL( ): Not supported") );
-#endif
// Not supported
Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
}
@@ -815,9 +757,6 @@
void CXdmDMAdapter::StartAtomicL()
{
// Not supported
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::StartAtomicL( ): Not supported") );
-#endif
}
// -----------------------------------------------------------------------------
@@ -827,9 +766,6 @@
void CXdmDMAdapter::CommitAtomicL()
{
// Not supported
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::CommitAtomicL( ): Not supported") );
-#endif
}
// -----------------------------------------------------------------------------
@@ -839,9 +775,6 @@
void CXdmDMAdapter::RollbackAtomicL()
{
// Not supported
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::RollBackAtomicL( ): Not supported") );
-#endif
}
// -----------------------------------------------------------------------------
@@ -850,9 +783,6 @@
//
TBool CXdmDMAdapter::StreamingSupport( TInt& /*aItemSize*/ )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::StreamingSupport( ): Return EFalse") );
-#endif
return EFalse;
}
@@ -863,9 +793,6 @@
void CXdmDMAdapter::StreamCommittedL()
{
// Not supported
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::StreamCommittedL( ): Not supported") );
-#endif
}
// -----------------------------------------------------------------------------
@@ -887,9 +814,6 @@
TXdmSettingsProperty aProperty,
CBufBase& aObject )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::GetPropertyL( ) - aSettingsId = %d"), &aSettingsId );
-#endif
HBufC* value = NULL;
TInt error( KErrNone );
TRAP( error, ( value = TXdmSettingsApi::PropertyL( aSettingsId, aProperty ) ) );
@@ -898,16 +822,9 @@
CleanupStack::PushL( value ); // << value
HBufC8* utfValue = ConvertLC( *value ); // << utfValue
aObject.InsertL( 0, *utfValue );
- CleanupStack::PopAndDestroy( utfValue ); // >>> utfValue
- CleanupStack::PopAndDestroy( value ); // >>> value
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::GetPropertyL( ): return EOk") );
-#endif
+ CleanupStack::PopAndDestroy( 2, utfValue ); // >>> value, utfValue
return CSmlDmAdapter::EOk;
}
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::GetPropertyL( ): return ENotFound") );
-#endif
return CSmlDmAdapter::ENotFound;
}
@@ -920,9 +837,6 @@
TXdmSettingsProperty aProperty,
const TDesC8& aObject )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UpdatePropertyL( ): begin") );
-#endif
HBufC* value = ConvertLC( aObject ); // << value
TInt error( KErrNone );
TRAP( error, TXdmSettingsApi::UpdatePropertyL( aSettingsId, *value, aProperty ) );
@@ -930,14 +844,8 @@
if ( error == KErrNone )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UpdatePropertyL( ): return EOk") );
-#endif
return CSmlDmAdapter::EOk;
}
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UpdatePropertyL( ): return ENotFound") );
-#endif
return CSmlDmAdapter::ENotFound;
}
@@ -953,9 +861,6 @@
MSmlDmDDFObject::TDFFormat aFormat,
const TDesC8& aDescription)
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::FillNodeInfoL( ): begin") );
-#endif
aNode.SetAccessTypesL( aAccTypes );
aNode.SetOccurenceL( aOccurrence );
aNode.SetScopeL( aScope );
@@ -966,9 +871,6 @@
aNode.AddDFTypeMimeTypeL( KXdmDmTextPlain );
}
aNode.SetDescriptionL( aDescription );
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::FillNodeInfoL( ): end") );
-#endif
}
@@ -978,9 +880,6 @@
//
TInt CXdmDMAdapter::IapIdFromURIL( const TDesC8& aUri )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::IapIdFromUriL( ): begin") );
-#endif
TInt id( KErrNotFound );
MSmlDmAdapter::TError status( MSmlDmAdapter::EError );
CBufBase* result = CBufFlat::NewL(1);
@@ -1002,9 +901,6 @@
}
CleanupStack::PopAndDestroy( result ); // >>> result
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::IapIdFromUriL( ): end") );
-#endif
return id;
}
@@ -1014,9 +910,6 @@
//
HBufC8* CXdmDMAdapter::URIFromIapIdL( TInt aId )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UriFromIapIdL( ): begin") );
-#endif
CBufBase *allIds = CBufFlat::NewL(KXdmDmIdTableSize);
CleanupStack::PushL( allIds ); // << allIds
MSmlDmAdapter::TError status;
@@ -1043,7 +936,7 @@
else
{
TPtrC8 uriSeg8Ptr = allIds->Ptr(segStart).Mid( 0, index );
- uriSeg = uriSeg8Ptr.AllocLC(); // << uriSeg
+ uriSeg = uriSeg8Ptr.AllocLC(); // << uriSeg8Ptr
}
// Construct the uri
HBufC8* uri = HBufC8::NewLC( KXdmDmAP().Length()
@@ -1064,25 +957,17 @@
if ( id == aId )
{
// The correct one found
- CleanupStack::Pop(); // >>> uri
- CleanupStack::PopAndDestroy( uriSeg ); // >>> uriSeg
- CleanupStack::PopAndDestroy( allIds ); // >>> allIds
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UriFromIapIdL( ): return uri") );
-#endif
+ CleanupStack::Pop(); // >>> uri
+ CleanupStack::PopAndDestroy( 2, allIds ); // >>> uriSeg, allIds
return uri;
}
}
// This was wrong, delete and get the next one
- CleanupStack::PopAndDestroy( uri ); // >>> uri
- CleanupStack::PopAndDestroy( uriSeg ); // >>> uriSeg
+ CleanupStack::PopAndDestroy( 2, uriSeg ); // >>> uri, uriSeg
segStart += index + 1;
}
}
CleanupStack::PopAndDestroy( allIds ); // >>> allIds
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::UriFromIapIdL( ): return NULL") );
-#endif
return NULL;
}
// -----------------------------------------------------------------------------
@@ -1091,9 +976,7 @@
//
TInt CXdmDMAdapter::GetSipIdL( const TDesC8& aUri )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::GetSipIdL( ): begin") );
-#endif
+
CSmlDmAdapter::TError status = EOk;
CBufBase* result = CBufFlat::NewL(1);
CleanupStack::PushL( result ); // << result
@@ -1108,16 +991,10 @@
TPtrC8 hexIndex = uri.Right( KXdmDmHexLength );
TLex8 lexer( hexIndex );
lexer.Val( id, EHex );
- CleanupStack::PopAndDestroy( result ); // >>> result
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::GetSipIdL( ): return id: %d"), id );
-#endif
+ CleanupStack::PopAndDestroy( result ); // >>> result
return id;
}
- CleanupStack::PopAndDestroy( result ); // >>> result
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::GetSipIdL( ): return KErrNotFound") );
-#endif
+ CleanupStack::PopAndDestroy( result ); // >>> result
return KErrNotFound;
}
// -----------------------------------------------------------------------------
@@ -1127,9 +1004,7 @@
CSmlDmAdapter::TError CXdmDMAdapter::FetchSipConRefL( TInt aSettingsId,
CBufBase& aObject)
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::FetchSipConRefL( ): begin") );
-#endif
+
CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
TInt sipSettingsId( KErrNotFound );
@@ -1209,9 +1084,7 @@
{
status = CSmlDmAdapter::ENotFound;
}
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::FetchSipConRefL( ): return status") );
-#endif
+
return status;
}
@@ -1221,16 +1094,10 @@
//
TInt CXdmDMAdapter::FindSettingsIdL( const TDesC8& aLUID, const TDesC8& aUri )
{
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::FindSettingsIdL( ): begin") );
-#endif
TInt settingsId(0);
if ( aLUID.Length() > 0 )
{
settingsId = DesToInt( aLUID );
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::FindSettingsIdL( ): return settingsId: %d "), settingsId );
-#endif
return settingsId;
}
else
@@ -1240,9 +1107,6 @@
HBufC8* luid = IntToDes8LC( settingsId ); // << luid
Callback().SetMappingL( aUri, *luid );
CleanupStack::PopAndDestroy( luid ); // luid
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::FindSettingsIdL( ): return settingsId: %d "), settingsId );
-#endif
return settingsId;
}
}
@@ -1252,10 +1116,7 @@
// -----------------------------------------------------------------------------
//
HBufC* CXdmDMAdapter::CheckExistingNamesLC( const TDesC8& aName )
- {
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::CheckExistingNamesLC( ): begin") );
-#endif
+ {
TBool ready( EFalse );
RArray<TInt> settingIds;
CleanupClosePushL( settingIds ); // << settingIds
@@ -1286,12 +1147,8 @@
ready = ETrue;
}
}
- CleanupStack::PopAndDestroy( settingNames ); // >>> settingNames
- CleanupStack::PopAndDestroy(); // >>> settingIds
+ CleanupStack::PopAndDestroy( 2 ); // >>> settingNames, settingIds
HBufC* newName = tempName.AllocLC(); // << newName
-#ifdef _DEBUG
- WriteToLog(_L8("CXdmDMAdapter::CheckExistingNamesLC( ): end") );
-#endif
return newName;
}