MCL/sf/app/messaging: comparison mmsengine/mmscodec/src/mmsdecode.cpp

equal deleted inserted replaced

-:ebe688cedc25
+:7fdbb852d323
 MMsvAttachmentManager& attaMan = iStore->AttachmentManagerL();
 MMsvAttachmentManagerSync& attaManSync = iStore->AttachmentManagerExtensionsL();
 TInt count = attaMan.AttachmentCount();
 TInt i;
 // delete all old attachments as we are starting from the beginning
-for ( i = count - 1; i >= 0; --i )
+for ( i = count - 1; i >= 0; i-- )
 {
 attaManSync.RemoveAttachmentL( i );
 }
 iStore->CommitL();
 });
 // ---------------------------------------------------------
 //
 void CMmsDecode::SelectNextState()
 {
-// If appropriate, the functions called within the switch statement
+// If appropiate, the functions called within the switch statement
 // will make us active again. If all is done, the asynchronous request
 // will complete
 switch ( iState )
 {
 // we only keep the first part from multipart/report
 MMsvAttachmentManager& attaMan = iStore->AttachmentManagerL();
 MMsvAttachmentManagerSync& attaManSync = iStore->AttachmentManagerExtensionsL();
 TInt count = attaMan.AttachmentCount();
 TInt i;
-for ( i = count - 1; i > 0; --i )
+for ( i = count - 1; i > 0; i-- )
 {
 attaManSync.RemoveAttachmentL( i );
 }
 }
 });
 #ifndef _NO_MMSS_LOGGING_
 // this may produce a long log - but only if the message is weird
 TUint i;
 TUint8 byte;
 TBuf<1> character;
-for ( i = iPosition; i < iPosition + length && i < iLength; ++i )
+for ( i = iPosition; i < iPosition + length && i < iLength; i++ )
 {
 iDecodeBuffer->Read(i, &byte, 1);
 TUint16 word = byte;
 if ( byte >= KMms0x20 && byte < KMms0x7F )
 {
 }
 TUint i;
 TUint length;
 length = byte;
-for ( i = 0;  i < length && iPosition < iLength; ++i)
+for ( i = 0;  i < length && iPosition < iLength; i++)
 {
 integer <<= KMmsBitsInByte;
 iDecodeBuffer->Read(iPosition, &byte, 1);
 iPosition++;
 integer += byte;
 TUint i;
 TUint length;
 length = byte;
-for ( i = 0;  i < length && iPosition < iLength; ++i)
+for ( i = 0;  i < length && iPosition < iLength; i++)
 {
 veryLongInteger <<= KMmsBitsInByte;
 iDecodeBuffer->Read(iPosition, &byte, 1);
 iPosition++;
 veryLongInteger += TUint( byte );
 // To handle X-headers and Java apllication id parameters,
 // the text string is offered to caller.
 // The header has been set to KMmsTextHeader to indicate that the field value
 // is still available.
+if ( ( header < 0 ) && ( iPosition < iLength ) )
+{
+SkipFieldValue();
+}
 return header;
 }
 // ---------------------------------------------------------
 // we may have a multipart structure or a single monoblock data body
 // we handle both here.
 // The momoblock structure probably won't work correctly in chunked mode
 // but it is not supposed to be supported anyway.
-// Before this function is called in the chunked mode we have checked
+// Before this funtion is called in the chunked mode we have checked
 // that we have enough data to cover all the headers (the length of the
 // headers is given in the beginning)
 if ( iMultipartType != 0 )
 {
 else
 {
 CBufFlat* shortBuffer = CBufFlat::NewL( KMms2 );
 CleanupStack::PushL( shortBuffer );
 shortBuffer->ResizeL( KMms2 );
-// no need to put it into cleanupstack... we don't leave before we delete it
+// no need to put it into cleanupstack... we dont't leave before we delete it
 TUint8 byte;
 // put little-endian BOM to buffer
 byte = 0xFF;
 shortBuffer->Write( 0, &byte, 1 );
 byte = 0xFE;
 // amr part in addition to possible one smil
 if ( iSmilCount <= 1 && iAudioCount == 1 &&
 ( iAttaNumber == iSmilCount + iAudioCount ) )
 {
-if(!CheckDRMContent())
+if(!CheckDRMContentL())
 {
 TBool audioSupported = EFalse;
 TRAP_IGNORE(
 {
 FeatureManager::InitializeLibL();
 // ---------------------------------------------------------
 // CMmsDecode::CheckDRMContent
 // ---------------------------------------------------------
 //
-TBool CMmsDecode::CheckDRMContent()
+TBool CMmsDecode::CheckDRMContentL()
 {
 CFileProtectionResolver* resolver = CFileProtectionResolver::NewLC( iFs);
 CMsvStore* store = iEntryWrapper->ReadStoreL();
 CleanupStack::PushL( store );
 TInt attaCount = attaManager.AttachmentCount();
 TInt flCount = 0;
 TInt sdCount = 0;
-for ( TInt i = 0; i < attaCount; ++i )
+for ( TInt i = 0; i < attaCount; i++ )
 {
 CMsvAttachment* info = attaManager.GetAttachmentInfoL( i );
 CleanupStack::PushL( info );
 TDataType dataType( info->MimeType() );
 if(dataType.Des8().Match(KmmsSmilMimeType) != KErrNotFound)
 // Very simple check to see if string is "safe" ASCII
 // Used for headers, which are short strings
 TInt i;
 TBool safe = ETrue;
-for ( i = 0; i < aString.Length() && safe; ++i )
+for ( i = 0; i < aString.Length() && safe; i++ )
 {
 if ( aString[i] < KMmsLowestAscii || aString[i] >= KMmsHighestAscii )
 {
 safe = EFalse;
 }

branch	RCL_3
changeset 27	7fdbb852d323
parent 26	ebe688cedc25