[Scummvm-cvs-logs] SF.net SVN: scummvm:[53585] scummvm/trunk/gui/console.cpp

[sev at users.sourceforge.net]

Revision: 53585
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53585&view=rev
Author:   sev
Date:     2010-10-18 20:19:58 +0000 (Mon, 18 Oct 2010)

Log Message:
-----------
Revert "GUI: Use vprintf in Console class. Patch by littleboy"

Modified Paths:
--------------
    scummvm/trunk/gui/console.cpp

Modified: scummvm/trunk/gui/console.cpp
===================================================================
--- scummvm/trunk/gui/console.cpp	2010-10-18 20:19:44 UTC (rev 53584)
+++ scummvm/trunk/gui/console.cpp	2010-10-18 20:19:58 UTC (rev 53585)
@@ -660,7 +660,7 @@
 }
 
 int ConsoleDialog::printf(const char *format, ...) {
-	va_list argptr;
+	va_list	argptr;
 
 	va_start(argptr, format);
 	int count = this->vprintf(format, argptr);
@@ -669,10 +669,17 @@
 }
 
 int ConsoleDialog::vprintf(const char *format, va_list argptr) {
-	Common::String output = Common::String::vprintf(format, argptr);
+	char	buf[2048];
 
-	print(output.c_str());
-	return output.size();
+#if defined(WIN32)
+	int count = _vsnprintf(buf, sizeof(buf), format, argptr);
+#elif defined(__SYMBIAN32__)
+	int count = vsprintf(buf, format, argptr);
+#else
+	int count = vsnprintf(buf, sizeof(buf), format, argptr);
+#endif
+	print(buf);
+	return count;
 }
 
 void ConsoleDialog::putchar(int c) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.