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

Toss lots of custom CString code

Browse Source 
We already have a C standard library, so let's not reimplement it.
This commit is contained in:
Adam Johnson
2012-06-17 20:15:04 -04:00
parent 1556d147d9
commit f0af98b0a7
29 changed files with 91 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Plasma/PubUtilLib/plFile/hsFiles.cpp
View File

@ -153,18 +153,20 @@ hsBool hsFolderIterator::NextFileSuffix(const char suffix[])
int hsFolderIterator::GetPathAndName(char pathandname[])
{
hsAssert(pathandname, "NULL path string");
const char* name = this->GetFileName();
int pathLen = hsStrlen(fPath);
int pathLen = strlen(fPath);
// add 1 for null terminator
int totalLen = pathLen + sizeof(kDirChar) + hsStrlen(name) + 1;
int totalLen = pathLen + sizeof(kDirChar) + strlen(name) + 1;
hsAssert(totalLen <= kFolderIterator_MaxPath, "Overrun kFolderIterator_MaxPath");
if (pathandname)
{ hsStrcpy(pathandname, fPath);
{
strcpy(pathandname, fPath);
if (pathLen > 0 && pathandname[pathLen - 1] != kDirChar)
pathandname[pathLen++] = kDirChar;
hsStrcpy(pathandname + pathLen, name);
strcpy(pathandname + pathLen, name);
}
return totalLen;
}

3
Sources/Plasma/PubUtilLib/plFile/plEncryptedStream.cpp
View File

@ -518,7 +518,8 @@ bool plEncryptedStream::ICheckMagicString(FILE* fp)
char magicString[kMagicStringLen+1];
fread(&magicString, kMagicStringLen, 1, fp);
magicString[kMagicStringLen] = '\0';
return (hsStrEQ(magicString, kMagicString) || hsStrEQ(magicString, kOldMagicString));
return strcmp(magicString, kMagicString) == 0 ||
strcmp(magicString, kOldMagicString) == 0;
}
bool plEncryptedStream::IsEncryptedFile(const char* fileName)

4
Sources/Plasma/PubUtilLib/plFile/plSecureStream.cpp
View File

@ -652,7 +652,7 @@ bool plSecureStream::ICheckMagicString(hsStream* s)
char magicString[kMagicStringLen+1];
s->Read(kMagicStringLen, &magicString);
magicString[kMagicStringLen] = '\0';
return (hsStrEQ(magicString, kMagicString) != 0);
return (strcmp(magicString, kMagicString) == 0);
}
bool plSecureStream::ICheckMagicString(hsFD fp)
@ -665,7 +665,7 @@ bool plSecureStream::ICheckMagicString(hsFD fp)
fread(&magicString, kMagicStringLen, 1, fp);
#endif
magicString[kMagicStringLen] = '\0';
return (hsStrEQ(magicString, kMagicString) != 0);
return (strcmp(magicString, kMagicString) == 0);
}
bool plSecureStream::IsSecureFile(const char* fileName)

2
Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.cpp
View File

@ -70,7 +70,7 @@ void plLoadAgeMsg::Write(hsStream* stream, hsResMgr* mgr)
plMessage::IMsgWrite(stream, mgr);
// write agename
uint8_t len=fAgeFilename?hsStrlen(fAgeFilename):0;
uint8_t len = fAgeFilename ? strlen(fAgeFilename) : 0;
stream->WriteLE(len);
if (len)
{

8
Sources/Plasma/PubUtilLib/plPipeline/hsG3DDeviceSelector.cpp
View File

@ -415,19 +415,19 @@ void hsG3DDeviceRecord::Write(hsStream* s) const
int len;
len = hsStrlen(fG3DDriverDesc);
len = strlen(fG3DDriverDesc);
s->WriteLE32(len);
s->Write(len, fG3DDriverDesc);
len = hsStrlen(fG3DDriverName);
len = strlen(fG3DDriverName);
s->WriteLE32(len);
s->Write(len, fG3DDriverName);
len = hsStrlen(fG3DDriverVersion);
len = strlen(fG3DDriverVersion);
s->WriteLE32(len);
s->Write(len, fG3DDriverVersion);
len = hsStrlen(fG3DDeviceDesc);
len = strlen(fG3DDeviceDesc);
s->WriteLE32(len);
s->Write(len, fG3DDeviceDesc);

8
Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
View File

@ -244,7 +244,7 @@ plRegistryPageNode* plResManager::FindSinglePage(const char* path) const
PageMap::const_iterator it;
for (it = fAllPages.begin(); it != fAllPages.end(); it++)
{
if (hsStrCaseEQ((it->second)->GetPagePath(), path))
if (strcmpi((it->second)->GetPagePath(), path) == 0)
return it->second;
}
@ -1651,8 +1651,8 @@ plRegistryPageNode* plResManager::FindPage(const char* age, const char* page) co
for (it = fAllPages.begin(); it != fAllPages.end(); ++it)
{
const plPageInfo& info = (it->second)->GetPageInfo();
if (hsStrCaseEQ(info.GetAge(), age) &&
hsStrCaseEQ(info.GetPage(), page))
if (strcmpi(info.GetAge(), age) == 0 &&
strcmpi(info.GetPage(), page) == 0)
return it->second;
}
@ -1766,7 +1766,7 @@ hsBool plResManager::IteratePages(plRegistryPageIterator* iterator, const char*
if (page->GetPageInfo().GetLocation() == plLocation::kGlobalFixedLoc)
continue;
if (!ageToRestrictTo || hsStrCaseEQ(page->GetPageInfo().GetAge(), ageToRestrictTo))
if (!ageToRestrictTo || strcmpi(page->GetPageInfo().GetAge(), ageToRestrictTo) == 0)
{
if (!iterator->EatPage(page))
{

4
Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp
View File

@ -1468,8 +1468,8 @@ bool plSimpleStateVariable::Set(const char* v, int idx)
if (v && fVar.GetType()==plVarDescriptor::kString32)
{
hsAssert(hsStrlen(v)<32, "string length overflow");
hsStrncpy(fS32[idx], v, 32);
hsAssert(strlen(v)<32, "string length overflow");
strncpy(fS32[idx], v, 32);
IVarSet();
return true;
}

4
Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp
View File

@ -310,7 +310,7 @@ void plProfileManagerFull::Update()
std::vector<plProfileBase*> group;
for (int i = 0; i < fVars.size(); i++)
if (hsStrEQ(fVars[i]->GetGroup(), groupName))
if (strcmp(fVars[i]->GetGroup(), groupName) == 0)
group.push_back(fVars[i]);
int x = 10;
@ -405,7 +405,7 @@ void plProfileManagerFull::IPrintGroup(hsStream* s, const char* groupName, bool
for (int i = 0; i < fVars.size(); i++)
{
plProfileVar* var = fVars[i];
if (hsStrEQ(var->GetGroup(), groupName))
if (strcmp(var->GetGroup(), groupName) == 0)
{
if (printTitle)
sprintf(buf, "%s:%s", var->GetGroup(), var->GetName());