R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust logging contexts

Browse Source 
Adjust the context properly, some were wrong (e.g. 'ENGINE' in 'COMMON' code).
This commit is contained in:
Kawe Mazidjatari 2023-07-22 21:14:04 +02:00
parent 36376e3b2f
commit 21f64bc572
10 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
r5dev/engine/sys_dll.cpp
View File

@ -163,8 +163,8 @@ void CModAppSystemGroup::InitPluginSystem(CModAppSystemGroup* pModAppSystemGroup
int HSys_Error_Internal(char* fmt, va_list args)
{
char buffer[2048];
Error(eDLL_T::COMMON, NO_ERROR, "_______________________________________________________________\n");
Error(eDLL_T::COMMON, NO_ERROR, "] ENGINE ERROR ################################################\n");
Error(eDLL_T::ENGINE, NO_ERROR, "_______________________________________________________________\n");
Error(eDLL_T::ENGINE, NO_ERROR, "] ENGINE ERROR ################################################\n");
int nLen = vsprintf(buffer, fmt, args);
bool shouldNewline = true;
@ -172,7 +172,7 @@ int HSys_Error_Internal(char* fmt, va_list args)
if (nLen > 0)
shouldNewline = buffer[nLen - 1] != '\n';
Error(eDLL_T::COMMON, NO_ERROR, shouldNewline ? "%s\n" : "%s", buffer);
Error(eDLL_T::ENGINE, NO_ERROR, shouldNewline ? "%s\n" : "%s", buffer);
///////////////////////////////////////////////////////////////////////////
return Sys_Error_Internal(fmt, args);

2
r5dev/engine/sys_utils.cpp
View File

@ -72,7 +72,7 @@ void _Warning(int level, char* fmt, ...)
if (level < 5)
{
Warning(eDLL_T::COMMON, shouldNewline ? "Warning(%d):%s\n" : "Warning(%d):%s", level, buf);
Warning(eDLL_T::ENGINE, shouldNewline ? "Warning(%d):%s\n" : "Warning(%d):%s", level, buf);
}
v_Warning(level, "%s", buf);

2
r5dev/gameui/IBrowser.cpp
View File

@ -368,7 +368,7 @@ void CBrowser::BrowserPanel(void)
void CBrowser::RefreshServerList(void)
{
DevMsg(eDLL_T::CLIENT, "Refreshing server list with matchmaking host '%s'\n", pylon_matchmaking_hostname->GetString());
std::string svServerListMessage;
g_pServerListManager->RefreshServerList(svServerListMessage);

2
r5dev/mathlib/vector.h
View File

@ -1958,7 +1958,7 @@ void Quaternion::Print() const
{
#ifndef _CERT
#if !defined(__SPU__)
DevMsg(eDLL_T::ENGINE, "q{ %.3fi + %.3fj + %.3fk + %.3f }", x, y, z, w);
DevMsg(eDLL_T::COMMON, "q{ %.3fi + %.3fj + %.3fk + %.3f }", x, y, z, w);
#endif
#endif
}

2
r5dev/tier1/NetAdr.cpp
View File

@ -109,7 +109,7 @@ void CNetAdr::ToAdrinfo(addrinfo* pHint) const
if (results != 0)
{
CHAR* wszError = gai_strerror(results);
Warning(eDLL_T::ENGINE, "Address info translation failed: (%s)\n", wszError);
Warning(eDLL_T::COMMON, "Address info translation failed: (%s)\n", wszError);
}
}

4
r5dev/tier1/cmd.cpp
View File

@ -114,7 +114,7 @@ bool CCommand::Tokenize(const char* pCommand, cmd_source_t source, characterset_
size_t nLen = Q_strlen(pCommand);
if (nLen >= COMMAND_MAX_LENGTH - 1)
{
Warning(eDLL_T::ENGINE, "%s: Encountered command which overflows the tokenizer buffer... Skipping!\n", __FUNCTION__);
Warning(eDLL_T::COMMON, "%s: Encountered command which overflows the tokenizer buffer... Skipping!\n", __FUNCTION__);
return false;
}
@ -170,7 +170,7 @@ bool CCommand::Tokenize(const char* pCommand, cmd_source_t source, characterset_
if (m_nArgc >= COMMAND_MAX_ARGC)
{
Warning(eDLL_T::ENGINE, "%s: Encountered command which overflows the argument buffer.. Clamped!\n", __FUNCTION__);
Warning(eDLL_T::COMMON, "%s: Encountered command which overflows the argument buffer.. Clamped!\n", __FUNCTION__);
}
nArgvBufferSize += nSize + 1;

42
r5dev/tier1/cvar.cpp
View File

@ -362,7 +362,7 @@ void ConVar::InstallChangeCallback(FnChangeCallback_t callback, bool bInvoke /*=
{
if (!callback)
{
Warning(eDLL_T::ENGINE, "%s: Called with NULL callback; ignoring!!!\n",
Warning(eDLL_T::COMMON, "%s: Called with NULL callback; ignoring!!!\n",
__FUNCTION__);
return;
}
@ -371,7 +371,7 @@ void ConVar::InstallChangeCallback(FnChangeCallback_t callback, bool bInvoke /*=
!= m_pParent->m_fnChangeCallbacks.InvalidIndex())
{
// Same ptr added twice, sigh...
Warning(eDLL_T::ENGINE, "%s: Ignoring duplicate change callback!!!\n",
Warning(eDLL_T::COMMON, "%s: Ignoring duplicate change callback!!!\n",
__FUNCTION__);
return;
}
@ -483,7 +483,7 @@ bool ConVar_ParseFlagString(const char* pszFlags, int& nFlags, const char* pszCo
int find = g_ConVarFlags.m_StringToFlags.FindElement(sFlag.Get(), -1);
if (find == -1)
{
Warning(eDLL_T::ENGINE,
Warning(eDLL_T::COMMON,
"%s: Attempted to parse invalid flag '%s' for convar '%s'\n",
__FUNCTION__, sFlag.Get(), pszConVarName);
@ -594,11 +594,11 @@ void ConVar_PrintDescription(ConCommandBase* pVar)
pStr = pVar->GetHelpText();
if (pStr && *pStr)
{
DevMsg(eDLL_T::ENGINE, "%-80s - %.80s\n", outstr, pStr);
DevMsg(eDLL_T::COMMON, "%-80s - %.80s\n", outstr, pStr);
}
else
{
DevMsg(eDLL_T::ENGINE, "%-80s\n", outstr);
DevMsg(eDLL_T::COMMON, "%-80s\n", outstr);
}
}
@ -671,7 +671,7 @@ static void PrintCvar(ConVar* var, bool logging, FileHandle_t& fh)
}
// Print to console
DevMsg(eDLL_T::ENGINE, "%-40s : %-8s : %-16s : %s\n", var->GetName(),
DevMsg(eDLL_T::COMMON, "%-40s : %-8s : %-16s : %s\n", var->GetName(),
valstr, flagstr, StripTabsAndReturns(var->GetHelpText(), tempbuff, sizeof(tempbuff)));
if (logging)
{
@ -689,7 +689,7 @@ static void PrintCommand(const ConCommand* cmd, bool logging, FileHandle_t& f)
{
// Print to console
char tempbuff[512] = { 0 };
DevMsg(eDLL_T::ENGINE, "%-40s : %-8s : %-16s : %s\n", cmd->GetName(),
DevMsg(eDLL_T::COMMON, "%-40s : %-8s : %-16s : %s\n", cmd->GetName(),
"cmd", "", StripTabsAndReturns(cmd->GetHelpText(), tempbuff, sizeof(tempbuff)));
if (logging)
@ -808,7 +808,7 @@ void CCvarUtilities::CvarList(const CCommand& args)
// Print usage?
if (iArgs == 2 && !Q_strcasecmp(args[1], "?"))
{
DevMsg(eDLL_T::ENGINE, "convar_list: [ log logfile ] [ partial ]\n");
DevMsg(eDLL_T::COMMON, "convar_list: [ log logfile ] [ partial ]\n");
return;
}
@ -823,7 +823,7 @@ void CCvarUtilities::CvarList(const CCommand& args)
}
else
{
DevMsg(eDLL_T::ENGINE, "Couldn't open '%s' for writing!\n", fn);
DevMsg(eDLL_T::COMMON, "Couldn't open '%s' for writing!\n", fn);
return;
}
@ -840,7 +840,7 @@ void CCvarUtilities::CvarList(const CCommand& args)
}
// Banner
DevMsg(eDLL_T::ENGINE, "convar list\n--------------\n");
DevMsg(eDLL_T::COMMON, "convar list\n--------------\n");
CUtlRBTree< ConCommandBase* > sorted(0, 0, ConCommandBaseLessFunc);
CCvar::CCVarIteratorInternal* itint = g_pCVar->FactoryInternalIterator();
@ -897,12 +897,12 @@ void CCvarUtilities::CvarList(const CCommand& args)
// Show total and syntax help...
if (partial && partial[0])
{
DevMsg(eDLL_T::ENGINE, "--------------\n%3i convars/concommands for [%s]\n",
DevMsg(eDLL_T::COMMON, "--------------\n%3i convars/concommands for [%s]\n",
sorted.Count(), partial);
}
else
{
DevMsg(eDLL_T::ENGINE, "--------------\n%3i total convars/concommands\n",
DevMsg(eDLL_T::COMMON, "--------------\n%3i total convars/concommands\n",
sorted.Count());
}
@ -922,7 +922,7 @@ void CCvarUtilities::CvarHelp(const CCommand& args)
if (args.ArgC() != 2)
{
DevMsg(eDLL_T::ENGINE, "Usage: help <cvarname>\n");
DevMsg(eDLL_T::COMMON, "Usage: help <cvarname>\n");
return;
}
@ -933,7 +933,7 @@ void CCvarUtilities::CvarHelp(const CCommand& args)
var = g_pCVar->FindCommandBase(search);
if (!var)
{
DevMsg(eDLL_T::ENGINE, "help: no cvar or command named %s\n", search);
DevMsg(eDLL_T::COMMON, "help: no cvar or command named %s\n", search);
return;
}
@ -970,7 +970,7 @@ void CCvarUtilities::CvarDifferences(const CCommand& args)
}
delete itint;
DevMsg(eDLL_T::ENGINE, "--------------\n%3i changed convars\n", i);
DevMsg(eDLL_T::COMMON, "--------------\n%3i changed convars\n", i);
}
//-----------------------------------------------------------------------------
@ -980,12 +980,12 @@ void CCvarUtilities::CvarFindFlags_f(const CCommand& args)
{
if (args.ArgC() < 2)
{
DevMsg(eDLL_T::ENGINE, "Usage: convar_findByFlags <string>\n");
DevMsg(eDLL_T::ENGINE, "Available flags to search for: \n");
DevMsg(eDLL_T::COMMON, "Usage: convar_findByFlags <string>\n");
DevMsg(eDLL_T::COMMON, "Available flags to search for: \n");
for (int i = 0; i < ARRAYSIZE(g_ConVarFlags.m_FlagsToDesc); i++)
{
DevMsg(eDLL_T::ENGINE, " - %s\n", g_ConVarFlags.m_FlagsToDesc[i].desc);
DevMsg(eDLL_T::COMMON, " - %s\n", g_ConVarFlags.m_FlagsToDesc[i].desc);
}
return;
}
@ -1250,7 +1250,7 @@ CConCommandHash::CCommandHashHandle_t CConCommandHash::Find(const ConCommandBase
// Dump a report to MSG
void CConCommandHash::Report(void)
{
DevMsg(eDLL_T::ENGINE, "Console command hash bucket load:\n");
DevMsg(eDLL_T::COMMON, "Console command hash bucket load:\n");
int total = 0;
for (int iBucket = 0; iBucket < kNUM_BUCKETS; ++iBucket)
{
@ -1262,11 +1262,11 @@ void CConCommandHash::Report(void)
iElement = m_aDataPool.Next(iElement);
}
DevMsg(eDLL_T::ENGINE, "%d: %d\n", iBucket, count);
DevMsg(eDLL_T::COMMON, "%d: %d\n", iBucket, count);
total += count;
}
DevMsg(eDLL_T::ENGINE, "\tAverage: %.1f\n", total / ((float)(kNUM_BUCKETS)));
DevMsg(eDLL_T::COMMON, "\tAverage: %.1f\n", total / ((float)(kNUM_BUCKETS)));
}
//#endif

4
r5dev/tier2/curlutils.cpp
View File

@ -20,7 +20,7 @@ CURL* CURLInitRequest(const char* remote, const char* request, string& outRespon
{
std::function<void(const char*)> fnError = [&](const char* errorMsg)
{
Error(eDLL_T::ENGINE, NO_ERROR, "CURL: %s\n", errorMsg);
Error(eDLL_T::COMMON, NO_ERROR, "CURL: %s\n", errorMsg);
curl_slist_free_all(slist);
};
@ -84,7 +84,7 @@ bool CURLHandleError(CURL* curl, const CURLcode res, string& outMessage, const b
const char* curlError = curl_easy_strerror(res);
if (logError)
Error(eDLL_T::ENGINE, NO_ERROR, "CURL: %s\n", curlError);
Error(eDLL_T::COMMON, NO_ERROR, "CURL: %s\n", curlError);
outMessage = curlError;
curl_easy_cleanup(curl);

22
r5dev/tier2/socketcreator.cpp
View File

@ -50,7 +50,7 @@ void CSocketCreator::ProcessAccept(void)
{
if (!IsSocketBlocking())
{
Error(eDLL_T::ENGINE, NO_ERROR, "%s - Error: %s\n", __FUNCTION__, NET_ErrorString(WSAGetLastError()));
Error(eDLL_T::COMMON, NO_ERROR, "%s - Error: %s\n", __FUNCTION__, NET_ErrorString(WSAGetLastError()));
}
return;
}
@ -92,7 +92,7 @@ bool CSocketCreator::CreateListenSocket(const netadr_t& netAdr, bool bDualStack)
int results = ::bind(m_hListenSocket, reinterpret_cast<sockaddr*>(&sadr), sizeof(sockaddr_in6));
if (results == SOCKET_ERROR)
{
Warning(eDLL_T::ENGINE, "Socket bind failed (%s)\n", NET_ErrorString(WSAGetLastError()));
Warning(eDLL_T::COMMON, "Socket bind failed (%s)\n", NET_ErrorString(WSAGetLastError()));
CloseListenSocket();
return false;
@ -101,7 +101,7 @@ bool CSocketCreator::CreateListenSocket(const netadr_t& netAdr, bool bDualStack)
results = ::listen(m_hListenSocket, SOCKET_TCP_MAX_ACCEPTS);
if (results == SOCKET_ERROR)
{
Warning(eDLL_T::ENGINE, "Socket listen failed (%s)\n", NET_ErrorString(WSAGetLastError()));
Warning(eDLL_T::COMMON, "Socket listen failed (%s)\n", NET_ErrorString(WSAGetLastError()));
CloseListenSocket();
return false;
@ -138,7 +138,7 @@ int CSocketCreator::ConnectSocket(const netadr_t& netAdr, bool bSingleSocket)
SocketHandle_t hSocket = SocketHandle_t(::socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP));
if (hSocket == SOCKET_ERROR)
{
Warning(eDLL_T::ENGINE, "Unable to create socket (%s)\n", NET_ErrorString(WSAGetLastError()));
Warning(eDLL_T::COMMON, "Unable to create socket (%s)\n", NET_ErrorString(WSAGetLastError()));
return SOCKET_ERROR;
}
@ -156,7 +156,7 @@ int CSocketCreator::ConnectSocket(const netadr_t& netAdr, bool bSingleSocket)
{
if (!IsSocketBlocking())
{
Warning(eDLL_T::ENGINE, "Socket connection failed (%s)\n", NET_ErrorString(WSAGetLastError()));
Warning(eDLL_T::COMMON, "Socket connection failed (%s)\n", NET_ErrorString(WSAGetLastError()));
DisconnectSocket(hSocket);
return SOCKET_ERROR;
@ -173,7 +173,7 @@ int CSocketCreator::ConnectSocket(const netadr_t& netAdr, bool bSingleSocket)
if (::select(hSocket + 1, NULL, &writefds, NULL, &tv) < 1) // block for at most 1 second.
{
Warning(eDLL_T::ENGINE, "Socket connection timed out\n");
Warning(eDLL_T::COMMON, "Socket connection timed out\n");
DisconnectSocket(hSocket); // took too long to connect to, give up.
return SOCKET_ERROR;
@ -194,7 +194,7 @@ void CSocketCreator::DisconnectSocket(SocketHandle_t hSocket)
Assert(hSocket != SOCKET_ERROR);
if (::closesocket(hSocket) == SOCKET_ERROR)
{
Error(eDLL_T::ENGINE, NO_ERROR, "Unable to close socket (%s)\n",
Error(eDLL_T::COMMON, NO_ERROR, "Unable to close socket (%s)\n",
NET_ErrorString(WSAGetLastError()));
}
}
@ -221,7 +221,7 @@ bool CSocketCreator::ConfigureSocket(SocketHandle_t hSocket, bool bDualStack /*=
int ret = ::setsockopt(hSocket, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char*>(&opt), sizeof(opt));
if (ret == SOCKET_ERROR)
{
Warning(eDLL_T::ENGINE, "Socket 'sockopt(%s)' failed (%s)\n", "TCP_NODELAY", NET_ErrorString(WSAGetLastError()));
Warning(eDLL_T::COMMON, "Socket 'sockopt(%s)' failed (%s)\n", "TCP_NODELAY", NET_ErrorString(WSAGetLastError()));
return false;
}
@ -230,7 +230,7 @@ bool CSocketCreator::ConfigureSocket(SocketHandle_t hSocket, bool bDualStack /*=
ret = ::setsockopt(hSocket, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char*>(&opt), sizeof(opt));
if (ret == SOCKET_ERROR)
{
Warning(eDLL_T::ENGINE, "Socket 'sockopt(%s)' failed (%s)\n", "SO_REUSEADDR", NET_ErrorString(WSAGetLastError()));
Warning(eDLL_T::COMMON, "Socket 'sockopt(%s)' failed (%s)\n", "SO_REUSEADDR", NET_ErrorString(WSAGetLastError()));
return false;
}
@ -241,7 +241,7 @@ bool CSocketCreator::ConfigureSocket(SocketHandle_t hSocket, bool bDualStack /*=
ret = ::setsockopt(hSocket, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<char*>(&opt), sizeof(opt));
if (ret == SOCKET_ERROR)
{
Warning(eDLL_T::ENGINE, "Socket 'sockopt(%s)' failed (%s)\n", "IPV6_V6ONLY", NET_ErrorString(WSAGetLastError()));
Warning(eDLL_T::COMMON, "Socket 'sockopt(%s)' failed (%s)\n", "IPV6_V6ONLY", NET_ErrorString(WSAGetLastError()));
return false;
}
}
@ -251,7 +251,7 @@ bool CSocketCreator::ConfigureSocket(SocketHandle_t hSocket, bool bDualStack /*=
ret = ::ioctlsocket(hSocket, FIONBIO, reinterpret_cast<u_long*>(&opt));
if (ret == SOCKET_ERROR)
{
Warning(eDLL_T::ENGINE, "Socket 'ioctl(%s)' failed (%s)\n", "FIONBIO", NET_ErrorString(WSAGetLastError()));
Warning(eDLL_T::COMMON, "Socket 'ioctl(%s)' failed (%s)\n", "FIONBIO", NET_ErrorString(WSAGetLastError()));
return false;
}

2
r5dev/vstdlib/random.cpp
View File

@ -123,7 +123,7 @@ int CUniformRandomStream::GenerateRandomNumber()
if (j >= NTAB || j < 0)
{
//DebuggerBreakIfDebugging();
//Warning("CUniformRandomStream had an array overrun: tried to write to element %d of 0..31. Contact Tom or Elan.\n", j);
//Warning(eDLL_T::COMMON, "CUniformRandomStream had an array overrun: tried to write to element %d of 0..31. Contact Tom or Elan.\n", j);
j = (j % NTAB) & 0x7fffffff;
}