From b9c83aa4a280b0e7a3b2af4fa48b4872ba36ee22 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Mon, 4 Oct 2004 05:50:28 +0000
Subject: [PATCH] Reworked SDK LogError() to include module names improved
 debugging output

---
 amxmodx/modules.cpp            | 18 ++++++++++--------
 amxmodx/msvc/amxmodx_mm.vcproj |  2 +-
 amxmodx/sdk/amxxmodule.cpp     | 16 ++++++++++++++--
 amxmodx/sdk/amxxmodule.h       |  4 ++--
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/amxmodx/modules.cpp b/amxmodx/modules.cpp
index 9b1d9854..dcb0c805 100755
--- a/amxmodx/modules.cpp
+++ b/amxmodx/modules.cpp
@@ -1190,7 +1190,8 @@ void LogError(AMX *amx, int err, const char *fmt, ...)
 	if (!dbg || !(dbg->tail))
 	{
 		GenericError(amx, err, amx->curline, buf, NULL);
-		AMXXLOG_Log("[AMXX] %s %s", buf, vbuf);
+		AMXXLOG_Log("[AMXX] %s", buf);
+		AMXXLOG_Log("%s", vbuf);
 	} else {
 		AMX_TRACE *t = dbg->tail;
 		AMX_DEBUGCALL tracer = (AMX_DEBUGCALL)(amx->userdata[1]);
@@ -1198,19 +1199,20 @@ void LogError(AMX *amx, int err, const char *fmt, ...)
 		cell line = amx->curline;
 		cell file = amx->curfile;
 		int i = 0;
-		if (file >= dbg->numFiles || file < 0)
-		{
-			GenericError(amx, err, line, buf, NULL);
-		} else {
-			GenericError(amx, err, line, buf, dbg->files[file]);
-		}
+		GenericError(amx, err, line, buf, NULL);
 		AMXXLOG_Log("[AMXX] %s", buf);
 		if (*vbuf)
 		{
-			AMXXLOG_Log("[AMXX] %s", vbuf);
+			AMXXLOG_Log("%s", vbuf);
 		}
 		AMXXLOG_Log("[AMXX] Debug Trace =>");
 		//log the error right away
+		if (file >= dbg->numFiles || file < 0)
+		{
+            AMXXLOG_Log("[AMXX]       [%d] Line %d, File \"%s\"", i++, line, g_plugins.findPluginFast(amx)->getName());
+		} else {
+			AMXXLOG_Log("[AMXX]       [%d] Line %d, File \"%s\"", i++, line, dbg->files[file]);
+		}
 		while (t != NULL)
 		{
 			line = t->line;
diff --git a/amxmodx/msvc/amxmodx_mm.vcproj b/amxmodx/msvc/amxmodx_mm.vcproj
index ddca6bab..7aae892a 100755
--- a/amxmodx/msvc/amxmodx_mm.vcproj
+++ b/amxmodx/msvc/amxmodx_mm.vcproj
@@ -316,7 +316,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
+				AdditionalDependencies="..\jit\jits.obj ..\zlib\zlib.lib"
 				OutputFile="jitdebug/amxmodx_mm.dll"
 				Version="0.1"
 				LinkIncremental="1"
diff --git a/amxmodx/sdk/amxxmodule.cpp b/amxmodx/sdk/amxxmodule.cpp
index e22a1187..9f4e7ebb 100755
--- a/amxmodx/sdk/amxxmodule.cpp
+++ b/amxmodx/sdk/amxxmodule.cpp
@@ -2454,7 +2454,7 @@ PFN_GET_AMXSTRINGLEN		g_fn_GetAmxStringLen;
 PFN_FORMAT_AMXSTRING		g_fn_FormatAmxString;
 PFN_COPY_AMXMEMORY			g_fn_CopyAmxMemory;
 PFN_LOG						g_fn_Log;
-PFN_LOG_ERROR				g_fn_LogError;
+PFN_LOG_ERROR				g_fn_LogErrorFunc;
 PFN_RAISE_AMXERROR			g_fn_RaiseAmxError;
 PFN_REGISTER_FORWARD		g_fn_RegisterForward;
 PFN_EXECUTE_FORWARD			g_fn_ExecuteForward;
@@ -2544,7 +2544,7 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("PrintSrvConsole", g_fn_PrintSrvConsole, PFN_PRINT_SRVCONSOLE);
 	REQFUNC("GetModname", g_fn_GetModname, PFN_GET_MODNAME);
 	REQFUNC("Log", g_fn_Log, PFN_LOG);
-	REQFUNC("LogError", g_fn_LogError, PFN_LOG_ERROR);
+	REQFUNC("LogError", g_fn_LogErrorFunc, PFN_LOG_ERROR);
 	REQFUNC("MergeDefinitionFile", g_fn_MergeDefinition_File, PFN_MERGEDEFINITION_FILE);
 	REQFUNC("Format", g_fn_Format, PFN_FORMAT);
 
@@ -2651,6 +2651,18 @@ void MF_Log(const char *fmt, ...)
 	g_fn_Log("[%s] %s", MODULE_NAME, msg);
 }
 
+void MF_LogError(AMX *amx, int err, const char *fmt, ...)
+{
+	// :TODO: Overflow possible here
+	char msg[3072];
+	va_list arglst;
+	va_start(arglst, fmt);
+	vsprintf(msg, fmt, arglst);
+	va_end(arglst);
+
+	g_fn_LogErrorFunc(amx, err, "[%s] %s", MODULE_NAME, msg);
+}
+
 
 #ifdef _DEBUG
 // validate macros
diff --git a/amxmodx/sdk/amxxmodule.h b/amxmodx/sdk/amxxmodule.h
index 1863c829..e0b0e8fa 100755
--- a/amxmodx/sdk/amxxmodule.h
+++ b/amxmodx/sdk/amxxmodule.h
@@ -1990,7 +1990,7 @@ extern PFN_GET_AMXSTRINGLEN			g_fn_GetAmxStringLen;
 extern PFN_FORMAT_AMXSTRING			g_fn_FormatAmxString;
 extern PFN_COPY_AMXMEMORY			g_fn_CopyAmxMemory;
 extern PFN_LOG						g_fn_Log;
-extern PFN_LOG_ERROR				g_fn_LogError;
+extern PFN_LOG_ERROR				g_fn_LogErrorFunc;
 extern PFN_RAISE_AMXERROR			g_fn_RaiseAmxError;
 extern PFN_REGISTER_FORWARD			g_fn_RegisterForward;
 extern PFN_EXECUTE_FORWARD			g_fn_ExecuteForward;
@@ -2106,7 +2106,7 @@ const char *	MF_Format					(const char *fmt, ...) { }
 #define MF_GetAmxStringLen g_fn_GetAmxStringLen
 #define MF_CopyAmxMemory g_fn_CopyAmxMemory
 void MF_Log(const char *fmt, ...);
-#define	MF_LogError g_fn_LogError
+void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_RaiseAmxError g_fn_RaiseAmxError
 #define MF_RegisterForward g_fn_RegisterForward
 #define MF_ExecuteForward g_fn_ExecuteForward