OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Fix Endian functions names in hsTypes and hsStream.

Browse Source 
Function and macro names for endianness were previously vague,
and on big-endian systems entirely misleading.  The names are
now properly descriptive of what they actually do.
This commit is contained in:
Joseph Davies
2011-10-23 14:01:54 -07:00
committed by Darryl Pogue
parent ab37a4a486
commit e462ef04b3
255 changed files with 2676 additions and 2676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.cpp
View File

@ -174,7 +174,7 @@ const char & plGenericType::IToChar( void ) const
void plGenericType::Read(hsStream* s)
{
IDeallocString();
s->ReadSwap(&fType);
s->ReadLE(&fType);
switch ( fType )
{
@ -184,23 +184,23 @@ void plGenericType::Read(hsStream* s)
break;
case kBool:
{Int8 b;
s->ReadSwap( &b );
s->ReadLE( &b );
fB = b?true:false;}
break;
case kChar:
s->ReadSwap( &fC );
s->ReadLE( &fC );
break;
case kInt :
s->ReadSwap( &fI );
s->ReadLE( &fI );
break;
case kUInt:
s->ReadSwap( &fU );
s->ReadLE( &fU );
break;
case kFloat:
s->ReadSwap( &fF );
s->ReadLE( &fF );
break;
case kDouble:
s->ReadSwap( &fD );
s->ReadLE( &fD );
break;
case kNone :
break;
@ -209,7 +209,7 @@ void plGenericType::Read(hsStream* s)
void plGenericType::Write(hsStream* s)
{
s->WriteSwap(fType);
s->WriteLE(fType);
switch ( fType )
{
@ -219,22 +219,22 @@ void plGenericType::Write(hsStream* s)
break;
case kBool:
{Int8 b = fB?1:0;
s->WriteSwap( b );}
s->WriteLE( b );}
break;
case kChar:
s->WriteSwap( fC );
s->WriteLE( fC );
break;
case kInt :
s->WriteSwap( fI );
s->WriteLE( fI );
break;
case kUInt:
s->WriteSwap( fU );
s->WriteLE( fU );
break;
case kFloat:
s->WriteSwap( fF );
s->WriteLE( fF );
break;
case kDouble:
s->WriteSwap( fD );
s->WriteLE( fD );
break;
case kNone :
break;

12
Sources/Plasma/NucleusLib/pnNetCommon/plNetAddress.cpp
View File

@ -149,16 +149,16 @@ std::string plNetAddress::AsString() const
void plNetAddress::Read(hsStream * s)
{
s->ReadSwap((UInt32*)&fAddr.sin_addr.s_addr);
s->ReadSwap(&fAddr.sin_port);
s->ReadSwap(&fAddr.sin_family);
s->ReadLE((UInt32*)&fAddr.sin_addr.s_addr);
s->ReadLE(&fAddr.sin_port);
s->ReadLE(&fAddr.sin_family);
}
void plNetAddress::Write(hsStream * s)
{
s->WriteSwap((UInt32)fAddr.sin_addr.s_addr);
s->WriteSwap(fAddr.sin_port);
s->WriteSwap(fAddr.sin_family);
s->WriteLE((UInt32)fAddr.sin_addr.s_addr);
s->WriteLE(fAddr.sin_port);
s->WriteLE(fAddr.sin_family);
}

4
Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h
View File

@ -76,8 +76,8 @@ public:
bool operator<(const plNetGroupId& netGroup) const { return fId < netGroup.fId; }
// read and write to hsStream
void Write(hsStream *s) const { fId.Write(s); s->WriteSwap(fFlags); }
void Read(hsStream *s) { fId.Read(s); s->LogReadSwap(&fFlags,"GroupId Flags"); }
void Write(hsStream *s) const { fId.Write(s); s->WriteLE(fFlags); }
void Read(hsStream *s) { fId.Read(s); s->LogReadLE(&fFlags,"GroupId Flags"); }
};
namespace plNetGroup

2
Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp
View File

@ -78,7 +78,7 @@ plNetResManager::~plNetResManager()
plCreatable* plNetResManager::IReadCreatable(hsStream* s) const
{
UInt16 hClass = s->ReadSwap16();
UInt16 hClass = s->ReadLE16();
if (plFactory::CanCreate(hClass))
{
plCreatable *pCre = plFactory::Create(hClass);

4
Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp
View File

@ -86,7 +86,7 @@ void plNetSharedState::Read(hsStream* stream)
Reset();
plMsgStdStringHelper::Peek(fName, stream);
Int32 num=stream->ReadSwap32();
Int32 num=stream->ReadLE32();
fServerMayDelete = stream->Readbool();
fVars.reserve(num);
@ -103,7 +103,7 @@ void plNetSharedState::Write(hsStream* stream)
{
plMsgStdStringHelper::Poke(fName, stream);
Int32 num=GetNumVars();
stream->WriteSwap32(num);
stream->WriteLE32(num);
stream->Writebool(fServerMayDelete);
int i;

12
Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp
View File

@ -333,11 +333,11 @@ void plSynchedObject::Read(hsStream* stream, hsResMgr* mgr)
hsKeyedObject::Read(stream, mgr);
fNetGroup = GetKey()->GetUoid().GetLocation();
stream->ReadSwap(&fSynchFlags);
stream->ReadLE(&fSynchFlags);
if (fSynchFlags & kExcludePersistentState)
{
Int16 num;
stream->ReadSwap(&num);
stream->ReadLE(&num);
fSDLExcludeList.clear();
int i;
for(i=0;i<num;i++)
@ -351,7 +351,7 @@ void plSynchedObject::Read(hsStream* stream, hsResMgr* mgr)
if (fSynchFlags & kHasVolatileState)
{
Int16 num;
stream->ReadSwap(&num);
stream->ReadLE(&num);
fSDLVolatileList.clear();
int i;
for(i=0;i<num;i++)
@ -366,12 +366,12 @@ void plSynchedObject::Read(hsStream* stream, hsResMgr* mgr)
void plSynchedObject::Write(hsStream* stream, hsResMgr* mgr)
{
hsKeyedObject::Write(stream, mgr);
stream->WriteSwap(fSynchFlags);
stream->WriteLE(fSynchFlags);
if (fSynchFlags & kExcludePersistentState)
{
Int16 num=fSDLExcludeList.size();
stream->WriteSwap(num);
stream->WriteLE(num);
SDLStateList::iterator it=fSDLExcludeList.begin();
for(; it != fSDLExcludeList.end(); it++)
@ -383,7 +383,7 @@ void plSynchedObject::Write(hsStream* stream, hsResMgr* mgr)
if (fSynchFlags & kHasVolatileState)
{
Int16 num=fSDLVolatileList.size();
stream->WriteSwap(num);
stream->WriteLE(num);
SDLStateList::iterator it=fSDLVolatileList.begin();
for(; it != fSDLVolatileList.end(); it++)

8
Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp
View File

@ -52,9 +52,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define ISaveOrLoadSimpleType() \
{ \
if (save) \
stream->WriteSwap(v); \
stream->WriteLE(v); \
else \
stream->ReadSwap(&v); \
stream->ReadLE(&v); \
return v; \
}
@ -101,7 +101,7 @@ const plKey plSynchedValueBase::ISaveOrLoad(const plKey key, hsBool32 save, hsSt
// I need to write a key to MY stream...
#if 0 // DEBUG
Int32 len = hsStrlen(key->GetName());
stream->WriteSwap32(len);
stream->WriteLE32(len);
stream->Write(len, key->GetName());
#endif
key->GetUoid().Write(stream);
@ -119,7 +119,7 @@ const plKey plSynchedValueBase::ISaveOrLoad(const plKey key, hsBool32 save, hsSt
{
// read a key from MY stream
#if 0 // DEBUG
Int32 len = stream->ReadSwap32();
Int32 len = stream->ReadLE32();
char tmp[256];
hsAssert(len<256, "key name overflow");
stream->Read(len, tmp);

4
Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.h
View File

@ -339,7 +339,7 @@ void plSynchedTArray<T>::ISaveOrLoad(hsBool32 save, hsStream* stream, hsResMgr*
{
// write out size of array
Int32 i, num = fValueList.GetCount();
stream->WriteSwap(num);
stream->WriteLE(num);
for(i=0;i<num;i++)
{
plSynchedValueBase::ISaveOrLoad(fValueList[i], save, stream, mgr);
@ -351,7 +351,7 @@ void plSynchedTArray<T>::ISaveOrLoad(hsBool32 save, hsStream* stream, hsResMgr*
fValueList.Reset();
// read in size of array
Int32 i, num;
stream->ReadSwap(&num);
stream->ReadLE(&num);
for(i=0;i<num;i++)
{

4
Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp
View File

@ -101,7 +101,7 @@ void plCreatableStream::Write( hsStream* stream, hsResMgr* mgr )
fStream.Rewind();
std::string buf;
UInt32 len = fStream.GetEOF();
stream->WriteSwap( len );
stream->WriteLE( len );
buf.resize( len );
fStream.Read( len, (void*)buf.data() );
stream->Write( len, (const void*)buf.data() );
@ -113,7 +113,7 @@ void plCreatableStream::Read( hsStream* stream, hsResMgr* mgr )
fStream.Rewind();
std::string buf;
UInt32 len;
stream->LogReadSwap( &len,"CreatableStream Len");
stream->LogReadLE( &len,"CreatableStream Len");
buf.resize( len );
stream->LogRead( len, (void*)buf.data(),"CreatableStream Data");
fStream.Write( len, (const void*)buf.data() );