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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/NucleusLib/pnNetDiag/pnNdDns.cpp
View File

@ -113,7 +113,7 @@ static void LookupCallback (
);
}
p->diag->DecRef("DNS");
DEL(p);
delete p;
}
@ -190,5 +190,5 @@ void NetDiagDns (
0,
dnsParam
);
FREE(host);
free(host);
}

2
Sources/Plasma/NucleusLib/pnNetDiag/pnNdIcmp.cpp
View File

@ -173,7 +173,7 @@ static void __cdecl PingThreadProc (void * param) {
p->callback(p->diag, p->protocol, result, p->param);
p->diag->DecRef("ICMP");
DEL(p);
delete p;
}

16
Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp
View File

@ -167,7 +167,7 @@ static bool Recv_PingReply (
if (trans) {
unsigned replyAtMs = TimeGetMs();
trans->conn->dump(L"[TCP] Reply from SrvAuth. ms=%u", replyAtMs - trans->pingAtMs);
DEL(trans);
delete trans;
return true;
}
else {
@ -209,7 +209,7 @@ static unsigned TimerCallback (void *) {
if (!curr->conn->error)
curr->conn->error = error;
curr->conn->dump(L"[TCP] No reply from SrvAuth: %u, %s (ms=%u)", error, NetErrorToString(error), diff);
DEL(curr);
delete curr;
}
}}
{for (FileTrans * next, * curr = s_fileTrans.Head(); curr; curr = next) {
@ -219,7 +219,7 @@ static unsigned TimerCallback (void *) {
if (!curr->conn->error)
curr->conn->error = error;
curr->conn->dump(L"[TCP] No reply from SrvFile: %u, %s (ms=%u)", error, NetErrorToString(error), diff);
DEL(curr);
delete curr;
}
}}
}
@ -244,7 +244,7 @@ static void AuthPingProc (void * param) {
for (;;) {
if (conn->done) {
conn->pingsCompleted = kMaxPings;
DEL(trans);
delete trans;
break;
}
while (++s_transId == 0)
@ -352,7 +352,7 @@ static void NotifyAuthConnSocketDisconnect (AuthConn * conn) {
while (AuthTrans * trans = authTrans.Head()) {
conn->dump(L"[TCP] No reply from SrvAuth: %u, %s", conn->error, NetErrorToString(conn->error));
DEL(trans);
delete trans;
}
conn->DecRef("Connected");
@ -419,7 +419,7 @@ static bool Recv_File2Cli_ManifestReply (FileConn * conn, const File2Cli_Manifes
if (trans) {
unsigned replyAtMs = TimeGetMs();
trans->conn->dump(L"[TCP] Reply from SrvFile. ms=%u", replyAtMs - trans->pingAtMs);
DEL(trans);
delete trans;
return true;
}
else {
@ -443,7 +443,7 @@ static void FilePingProc (void * param) {
for (;;) {
if (conn->done) {
conn->pingsCompleted = kMaxPings;
DEL(trans);
delete trans;
break;
}
while (++s_transId == 0)
@ -523,7 +523,7 @@ static void NotifyFileConnSocketDisconnect (FileConn * conn) {
while (FileTrans * trans = fileTrans.Head()) {
conn->dump(L"[TCP] No reply from SrvFile: %u, %s", conn->error, NetErrorToString(conn->error));
DEL(trans);
delete trans;
}
conn->DecRef("Connected");

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

@ -82,7 +82,7 @@ const wchar_t g_version[] = L"solvent";
NetDiag::~NetDiag () {
for (unsigned srv = 0; srv < kNumDiagSrvs; ++srv)
FREE(hosts[srv]);
free(hosts[srv]);
}
//============================================================================
@ -90,7 +90,7 @@ void NetDiag::SetHost (unsigned srv, const wchar_t host[]) {
critsect.Enter();
{
FREE(hosts[srv]);
free(hosts[srv]);
if (host)
hosts[srv] = StrDup(host);

2
Sources/Plasma/NucleusLib/pnNetDiag/pnNetSys.cpp
View File

@ -172,6 +172,6 @@ void NetDiagSys (
dump(L"[SYS] Error getting adaper list");
callback(diag, kNetProtocolNil, kNetErrFileNotFound, param);
}
FREE(pInfo);
free(pInfo);
}
}