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

sev at users.sourceforge.net sev at users.sourceforge.net
Mon Oct 18 21:07:25 CEST 2010


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

Log Message:
-----------
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 19:04:41 UTC (rev 53576)
+++ scummvm/trunk/gui/console.cpp	2010-10-18 19:07:24 UTC (rev 53577)
@@ -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,17 +669,10 @@
 }
 
 int ConsoleDialog::vprintf(const char *format, va_list argptr) {
-	char	buf[2048];
+	Common::String output = Common::String::vprintf(format, argptr);
 
-#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;
+	print(output.c_str());
+	return output.size();
 }
 
 void ConsoleDialog::putchar(int c) {


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




More information about the Scummvm-git-logs mailing list