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

Get rid of NEW(), TRACKED_NEW, and ZERO().

This commit is contained in:
Darryl Pogue
2012-01-21 01:09:48 -08:00
committed by Adam Johnson
parent 30430d3024
commit 5013a978eb
423 changed files with 2500 additions and 2503 deletions

View File

@ -121,7 +121,7 @@ hsStream* hsFile::OpenStream(const char mode[], hsBool throwIfFailure)
FILE* file = this->OpenFILE(mode, throwIfFailure);
if (file)
{ hsUNIXStream* stream = TRACKED_NEW hsUNIXStream;
{ hsUNIXStream* stream = new hsUNIXStream;
stream->SetFILE(file);
return stream;
}

View File

@ -185,7 +185,7 @@ hsStream* hsMacFile::OpenStream(const char mode[], hsBool throwIfFailure)
perm |= fsWrPerm;
if (this->OpenDataFork(perm, &refnum))
{ hsFileStream* stream = TRACKED_NEW hsFileStream;
{ hsFileStream* stream = new hsFileStream;
stream->SetFileRef(refnum);
return stream;
}
@ -218,7 +218,7 @@ struct hsFolderIterator_Data {
hsFolderIterator::hsFolderIterator(const char path[])
{
fData = TRACKED_NEW hsFolderIterator_Data;
fData = new hsFolderIterator_Data;
fData->fCurrIndex = 0;
fData->fValid = false;
@ -231,7 +231,7 @@ hsFolderIterator::hsFolderIterator(const char path[])
hsFolderIterator::hsFolderIterator(const struct FSSpec* spec) // Alt Constructor - pass in FSSpec from OpenDlg()
{
fData = TRACKED_NEW hsFolderIterator_Data;
fData = new hsFolderIterator_Data;
fData->fCurrIndex = 0;
fData->fValid = false;

View File

@ -64,7 +64,7 @@ struct hsFolderIterator_Data {
hsFolderIterator::hsFolderIterator(const char path[], bool)
{
fData = TRACKED_NEW hsFolderIterator_Data;
fData = new hsFolderIterator_Data;
this->SetPath(path);
}

View File

@ -56,7 +56,7 @@ hsFolderIterator::hsFolderIterator(const char path[], bool useCustomFilter)
{
fCustomFilter = useCustomFilter;
fData = TRACKED_NEW hsFolderIterator_Data;
fData = new hsFolderIterator_Data;
fData->fSearchHandle = nil;
fData->fValid = true;
@ -191,7 +191,7 @@ hsWFolderIterator::hsWFolderIterator(const wchar_t path[], bool useCustomFilter)
{
fCustomFilter = useCustomFilter;
fData = TRACKED_NEW hsWFolderIterator_Data;
fData = new hsWFolderIterator_Data;
fData->fSearchHandle = nil;
fData->fValid = true;

View File

@ -157,8 +157,8 @@ hsBool plEncryptedStream::Open(const wchar_t* name, const wchar_t* mode)
}
else if (wcscmp(mode, L"wb") == 0)
{
fRAMStream = TRACKED_NEW hsVectorStream;
fWriteFileName = TRACKED_NEW wchar_t[wcslen(name) + 1];
fRAMStream = new hsVectorStream;
fWriteFileName = new wchar_t[wcslen(name) + 1];
wcscpy(fWriteFileName, name);
fPosition = 0;
@ -232,7 +232,7 @@ uint32_t plEncryptedStream::IRead(uint32_t bytes, void* buffer)
void plEncryptedStream::IBufferFile()
{
fRAMStream = TRACKED_NEW hsVectorStream;
fRAMStream = new hsVectorStream;
char buf[1024];
while (!AtEnd())
{
@ -560,11 +560,11 @@ hsStream* plEncryptedStream::OpenEncryptedFile(const wchar_t* fileName, bool req
hsStream* s = nil;
if (isEncrypted)
s = TRACKED_NEW plEncryptedStream(cryptKey);
s = new plEncryptedStream(cryptKey);
// If this isn't an external release, let them use unencrypted data
else
if (!requireEncrypted)
s = TRACKED_NEW hsUNIXStream;
s = new hsUNIXStream;
if (s)
s->Open(fileName, L"rb");
@ -583,9 +583,9 @@ hsStream* plEncryptedStream::OpenEncryptedFileWrite(const wchar_t* fileName, uin
{
hsStream* s = nil;
#ifdef PLASMA_EXTERNAL_RELEASE
s = TRACKED_NEW plEncryptedStream(cryptKey);
s = new plEncryptedStream(cryptKey);
#else
s = TRACKED_NEW hsUNIXStream;
s = new hsUNIXStream;
#endif
s->Open(fileName, L"wb");

View File

@ -156,7 +156,7 @@ hsBool plInitFileReader::Parse( uint32_t userData )
hsAssert( fStream != nil, "Nil stream in initFileReader::Parse(); file not yet open?" );
if( fCurrLine == nil )
fCurrLine = TRACKED_NEW char[ fLineSize + 1 ];
fCurrLine = new char[ fLineSize + 1 ];
// Start parsing lines
while( fStream->ReadLn( fCurrLine, fLineSize ) )

View File

@ -230,8 +230,8 @@ hsBool plSecureStream::Open(const wchar_t* name, const wchar_t* mode)
}
else if (wcscmp(mode, L"wb") == 0)
{
fRAMStream = TRACKED_NEW hsVectorStream;
fWriteFileName = TRACKED_NEW wchar_t[wcslen(name) + 1];
fRAMStream = new hsVectorStream;
fWriteFileName = new wchar_t[wcslen(name) + 1];
wcscpy(fWriteFileName, name);
fPosition = 0;
@ -351,7 +351,7 @@ uint32_t plSecureStream::IRead(uint32_t bytes, void* buffer)
void plSecureStream::IBufferFile()
{
fRAMStream = TRACKED_NEW hsVectorStream;
fRAMStream = new hsVectorStream;
char buf[1024];
while (!AtEnd())
{
@ -728,9 +728,9 @@ hsStream* plSecureStream::OpenSecureFile(const wchar_t* fileName, const uint32_t
hsStream* s = nil;
if (isEncrypted)
s = TRACKED_NEW plSecureStream(deleteOnExit, key);
s = new plSecureStream(deleteOnExit, key);
else if (!requireEncryption) // If this isn't an external release, let them use unencrypted data
s = TRACKED_NEW hsUNIXStream;
s = new hsUNIXStream;
if (s)
s->Open(fileName, L"rb");
@ -749,9 +749,9 @@ hsStream* plSecureStream::OpenSecureFileWrite(const wchar_t* fileName, uint32_t*
{
hsStream* s = nil;
#ifdef PLASMA_EXTERNAL_RELEASE
s = TRACKED_NEW plSecureStream(false, key);
s = new plSecureStream(false, key);
#else
s = TRACKED_NEW hsUNIXStream;
s = new hsUNIXStream;
#endif
s->Open(fileName, L"wb");