Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3940] trunk/OpenMPT
|
From: <man...@us...> - 2014-03-23 15:59:32
|
Revision: 3940
http://sourceforge.net/p/modplug/code/3940
Author: manxorist
Date: 2014-03-23 15:59:24 +0000 (Sun, 23 Mar 2014)
Log Message:
-----------
[Ref] serialization_utils: Restrict member accesses.
Modified Paths:
--------------
trunk/OpenMPT/common/serialization_utils.h
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/ModSequence.cpp
trunk/OpenMPT/soundlib/pattern.cpp
trunk/OpenMPT/soundlib/patternContainer.cpp
trunk/OpenMPT/soundlib/tuning.cpp
trunk/OpenMPT/soundlib/tuningCollection.cpp
Modified: trunk/OpenMPT/common/serialization_utils.h
===================================================================
--- trunk/OpenMPT/common/serialization_utils.h 2014-03-23 15:12:27 UTC (rev 3939)
+++ trunk/OpenMPT/common/serialization_utils.h 2014-03-23 15:59:24 UTC (rev 3940)
@@ -284,20 +284,24 @@
void SetFlag(Rwf flag, bool val) {m_Flags.set(flag, val);}
bool GetFlag(Rwf flag) const {return m_Flags[flag];}
+ SsbStatus GetStatus() const
+ {
+ return m_Status;
+ }
+
+protected:
+
// Write given string to log if log func is defined.
void AddToLog(const char *psz);
-protected:
-
void AddNote(const SsbStatus s, const char* sz);
-public:
+protected:
SsbStatus m_Status;
+
uint32 m_nFixedEntrySize; // Read/write: If > 0, data entries have given fixed size.
-protected:
-
Postype m_posStart; // Read/write: Stream position at the beginning of object.
uint16 m_nIdbytes; // Read/Write: Tells map ID entry size in bytes. If size is variable, value is IdSizeVariable.
@@ -305,7 +309,7 @@
std::bitset<RwfNumFlags> m_Flags; // Read/write: Various flags.
-public:
+protected:
static const uint8 s_DefaultFlagbyte = 0;
static const char s_EntryID[3];
@@ -398,8 +402,6 @@
std::istream* m_pIstrm; // Read: Pointer to read stream.
-private:
-
std::vector<char> m_Idarray; // Read: Holds entry ids.
std::vector<ReadEntry> mapData; // Read: Contains map information.
@@ -469,8 +471,6 @@
std::ostream* m_pOstrm; // Write: Pointer to write stream.
-private:
-
Postype m_posEntrycount; // Write: Pos of entrycount field.
Postype m_posMapPosField; // Write: Pos of map position field.
std::string m_MapStreamString; // Write: Map stream string.
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2014-03-23 15:12:27 UTC (rev 3939)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2014-03-23 15:59:24 UTC (rev 3940)
@@ -1029,7 +1029,7 @@
ssb.ReadItem(Patterns, FileIdPatterns, strlen(FileIdPatterns), &ReadModPatterns);
ssb.ReadItem(Order, FileIdSequences, strlen(FileIdSequences), &ReadModSequences);
- if(ssb.m_Status & srlztn::SNT_FAILURE)
+ if(ssb.GetStatus() & srlztn::SNT_FAILURE)
{
AddToLog("Unknown error occured while deserializing file.");
}
@@ -1647,7 +1647,7 @@
ssb.FinishWrite();
- if(ssb.m_Status & srlztn::SNT_FAILURE)
+ if(ssb.GetStatus() & srlztn::SNT_FAILURE)
{
AddToLog("Error occured in writing MPTM extensions.");
}
Modified: trunk/OpenMPT/soundlib/ModSequence.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModSequence.cpp 2014-03-23 15:12:27 UTC (rev 3939)
+++ trunk/OpenMPT/soundlib/ModSequence.cpp 2014-03-23 15:59:24 UTC (rev 3940)
@@ -827,7 +827,7 @@
{
srlztn::SsbRead ssb(iStrm);
ssb.BeginRead(FileIdSequence, MptVersion::num);
- if ((ssb.m_Status & srlztn::SNT_FAILURE) != 0)
+ if ((ssb.GetStatus() & srlztn::SNT_FAILURE) != 0)
return;
std::string str;
ssb.ReadItem(str, "n");
@@ -865,7 +865,7 @@
{
srlztn::SsbRead ssb(iStrm);
ssb.BeginRead(FileIdSequences, MptVersion::num);
- if ((ssb.m_Status & srlztn::SNT_FAILURE) != 0)
+ if ((ssb.GetStatus() & srlztn::SNT_FAILURE) != 0)
return;
uint8 nSeqs = 0;
uint8 nCurrent = 0;
Modified: trunk/OpenMPT/soundlib/pattern.cpp
===================================================================
--- trunk/OpenMPT/soundlib/pattern.cpp 2014-03-23 15:12:27 UTC (rev 3939)
+++ trunk/OpenMPT/soundlib/pattern.cpp 2014-03-23 15:59:24 UTC (rev 3940)
@@ -499,7 +499,7 @@
{
srlztn::SsbRead ssb(iStrm);
ssb.BeginRead(FileIdPattern, MptVersion::num);
- if ((ssb.m_Status & srlztn::SNT_FAILURE) != 0)
+ if ((ssb.GetStatus() & srlztn::SNT_FAILURE) != 0)
return;
ssb.ReadItem(pat, "data", strlen("data"), &ReadData);
// pattern time signature
Modified: trunk/OpenMPT/soundlib/patternContainer.cpp
===================================================================
--- trunk/OpenMPT/soundlib/patternContainer.cpp 2014-03-23 15:12:27 UTC (rev 3939)
+++ trunk/OpenMPT/soundlib/patternContainer.cpp 2014-03-23 15:59:24 UTC (rev 3940)
@@ -211,7 +211,7 @@
{
srlztn::SsbRead ssb(iStrm);
ssb.BeginRead(FileIdPatterns, MptVersion::num);
- if ((ssb.m_Status & srlztn::SNT_FAILURE) != 0)
+ if ((ssb.GetStatus() & srlztn::SNT_FAILURE) != 0)
return;
PATTERNINDEX nPatterns = patc.Size();
uint16 nCount = uint16_max;
Modified: trunk/OpenMPT/soundlib/tuning.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuning.cpp 2014-03-23 15:12:27 UTC (rev 3939)
+++ trunk/OpenMPT/soundlib/tuning.cpp 2014-03-23 15:59:24 UTC (rev 3940)
@@ -396,7 +396,7 @@
ssb.ReadItem(pTuning->m_SerHelperRatiotableSize, "RTI4");
// If reader status is ok and m_StepMin is somewhat reasonable, process data.
- if ((ssb.m_Status & srlztn::SNT_FAILURE) == 0 && pTuning->m_StepMin >= -300 && pTuning->m_StepMin <= 300)
+ if ((ssb.GetStatus() & srlztn::SNT_FAILURE) == 0 && pTuning->m_StepMin >= -300 && pTuning->m_StepMin <= 300)
{
EDITMASK temp = pTuning->GetEditMask();
pTuning->m_EditMask = EM_ALLOWALL; //Allowing all while processing data.
@@ -503,7 +503,7 @@
ssb.FinishWrite();
- return ((ssb.m_Status & srlztn::SNT_FAILURE) != 0) ? SERIALIZATION_FAILURE : SERIALIZATION_SUCCESS;
+ return ((ssb.GetStatus() & srlztn::SNT_FAILURE) != 0) ? SERIALIZATION_FAILURE : SERIALIZATION_SUCCESS;
}
Modified: trunk/OpenMPT/soundlib/tuningCollection.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningCollection.cpp 2014-03-23 15:12:27 UTC (rev 3939)
+++ trunk/OpenMPT/soundlib/tuningCollection.cpp 2014-03-23 15:59:24 UTC (rev 3940)
@@ -112,7 +112,7 @@
ssb.WriteItem(*m_Tunings[i], "2", 1, &WriteTuning);
ssb.FinishWrite();
- if(ssb.m_Status & srlztn::SNT_FAILURE)
+ if(ssb.GetStatus() & srlztn::SNT_FAILURE)
return true;
else
return false;
@@ -179,7 +179,7 @@
ssb.ReadItem(iter, *this, &ReadTuning);
}
- if(ssb.m_Status & srlztn::SNT_FAILURE)
+ if(ssb.GetStatus() & srlztn::SNT_FAILURE)
return true;
else
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
