2
3
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00

Get rid of DEL() and FREE() macros.

Part of CoreLibExe must die.
This commit is contained in:
Darryl Pogue
2011-10-23 20:52:33 -07:00
committed by Adam Johnson
parent be26b145df
commit 8a3f0cfd5b
88 changed files with 262 additions and 265 deletions

View File

@ -3634,7 +3634,7 @@ bool FileDownloadRequestTrans::Recv (
writeTrans->writer = m_writer;
writeTrans->bytes = reply.chunkSize;
writeTrans->offset = reply.chunkOffset;
writeTrans->data = (uint8_t *)ALLOC(reply.chunkSize);
writeTrans->data = (uint8_t *)malloc(reply.chunkSize);
MemCopy(writeTrans->data, reply.chunkData, reply.chunkSize);
NetTransSend(writeTrans);
}
@ -3664,7 +3664,7 @@ bool FileDownloadRequestTrans::Recv (
//============================================================================
RcvdFileDownloadChunkTrans::~RcvdFileDownloadChunkTrans () {
FREE(data);
free(data);
}
//============================================================================
@ -3687,7 +3687,7 @@ void RcvdFileDownloadChunkTrans::Post () {
//============================================================================
RcvdPropagatedBufferTrans::~RcvdPropagatedBufferTrans () {
FREE(bufferData);
free(bufferData);
}
//============================================================================
@ -3845,10 +3845,10 @@ VaultInitAgeTrans::VaultInitAgeTrans (
//============================================================================
VaultInitAgeTrans::~VaultInitAgeTrans () {
FREE(m_ageFilename);
FREE(m_ageInstName);
FREE(m_ageUserName);
FREE(m_ageDesc);
free(m_ageFilename);
free(m_ageInstName);
free(m_ageUserName);
free(m_ageDesc);
}
//============================================================================

View File

@ -108,7 +108,7 @@ struct ConnectedNotifyTrans : NetNotifyTrans {
, m_latestBuildId(lbi)
{ }
~ConnectedNotifyTrans () {
DEL(m_connectParam);
delete m_connectParam;
}
void Post ();
};
@ -543,7 +543,7 @@ CliCsConn::~CliCsConn () {
if (cli)
NetCliDelete(cli, true);
DEL(connectParam);
delete connectParam;
AtomicAdd(&s_perf[kPerfConnCount], -1);
}

View File

@ -1195,7 +1195,7 @@ bool DownloadRequestTrans::Recv (
RcvdFileDownloadChunkTrans * writeTrans = NEW(RcvdFileDownloadChunkTrans);
writeTrans->writer = m_writer;
writeTrans->bytes = byteCount;
writeTrans->data = (uint8_t *)ALLOC(byteCount);
writeTrans->data = (uint8_t *)malloc(byteCount);
MemCopy(writeTrans->data, data, byteCount);
NetTransSend(writeTrans);
}
@ -1217,7 +1217,7 @@ bool DownloadRequestTrans::Recv (
//============================================================================
RcvdFileDownloadChunkTrans::~RcvdFileDownloadChunkTrans () {
FREE(data);
free(data);
}
//============================================================================

View File

@ -456,7 +456,7 @@ static bool Recv_PropagateBuffer (
RcvdPropagatedBufferTrans * trans = NEW(RcvdPropagatedBufferTrans);
trans->bufferType = reply.type;
trans->bufferBytes = reply.bytes;
trans->bufferData = (uint8_t *)ALLOC(reply.bytes);
trans->bufferData = (uint8_t *)malloc(reply.bytes);
MemCopy(trans->bufferData, reply.buffer, reply.bytes);
NetTransSend(trans);
@ -473,7 +473,7 @@ static bool Recv_GameMgrMsg (
RcvdGameMgrMsgTrans * trans = NEW(RcvdGameMgrMsgTrans);
trans->bufferBytes = reply.bytes;
trans->bufferData = (uint8_t *)ALLOC(reply.bytes);
trans->bufferData = (uint8_t *)malloc(reply.bytes);
MemCopy(trans->bufferData, reply.buffer, reply.bytes);
NetTransSend(trans);
@ -570,7 +570,7 @@ bool JoinAgeRequestTrans::Recv (
//============================================================================
RcvdPropagatedBufferTrans::~RcvdPropagatedBufferTrans () {
FREE(bufferData);
free(bufferData);
}
//============================================================================
@ -587,7 +587,7 @@ void RcvdPropagatedBufferTrans::Post () {
//============================================================================
RcvdGameMgrMsgTrans::~RcvdGameMgrMsgTrans () {
FREE(bufferData);
free(bufferData);
}
//============================================================================