[ros-diffs] [navaraf] 19838: Make the debugging functions slightly more portable.

[navaraf at svn.reactos.com]

Make the debugging functions slightly more portable.
Modified: trunk/reactos/boot/freeldr/freeldr/debug.c
  _____  

Modified: trunk/reactos/boot/freeldr/freeldr/debug.c
--- trunk/reactos/boot/freeldr/freeldr/debug.c	2005-12-03 14:07:38 UTC
(rev 19837)
+++ trunk/reactos/boot/freeldr/freeldr/debug.c	2005-12-03 15:26:36 UTC
(rev 19838)
@@ -231,9 +231,9 @@

 
 VOID DebugPrint(ULONG Mask, char *format, ...)
 {
-	int *dataptr = (int *) &format;
-        char Buffer[4096];
-        char *ptr = Buffer;
+	va_list ap;
+	char Buffer[4096];
+	char *ptr = Buffer;
 
 	// Mask out unwanted debug messages
 	if (!(Mask & DebugPrintMask))
@@ -248,24 +248,28 @@
 		DebugStartOfLine = FALSE;
 	}
 
-        vsprintf(Buffer, format, (PVOID)(++dataptr));
-        while (*ptr)
-        {
-            DebugPrintChar(*ptr++);
-        }
+	va_start(ap, format);
+	vsprintf(Buffer, format, ap);
+	va_end(ap);
+	while (*ptr)
+	{
+		DebugPrintChar(*ptr++);
+	}
 }
 
 VOID DebugPrint1(char *format, ...)
 {
-	int *dataptr = (int *) &format;
-        char Buffer[4096];
-        char *ptr = Buffer;
+	va_list ap;
+	char Buffer[4096];
+	char *ptr = Buffer;
 
-        vsprintf(Buffer, format, (PVOID)(++dataptr));
-        while (*ptr)
-        {
-            DebugPrintChar(*ptr++);
-        }
+	va_start(ap, format);
+	vsprintf(Buffer, format, ap);
+	va_end(ap);
+	while (*ptr)
+	{
+		DebugPrintChar(*ptr++);
+	}
 }
 
 VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051203/8972a0e8/attachment.html