diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /gui/console.cpp | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'gui/console.cpp')
| -rw-r--r-- | gui/console.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gui/console.cpp b/gui/console.cpp index b656d23a09..dc2c5c4f33 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -665,12 +665,11 @@ int ConsoleDialog::printFormat(int dummy, const char *format, ...) { } int ConsoleDialog::vprintFormat(int dummy, const char *format, va_list argptr) { - char buf[2048]; + Common::String buf = Common::String::vformat(format, argptr); - int count = vsnprintf(buf, sizeof(buf), format, argptr); - buf[sizeof(buf)-1] = 0; // ensure termination - print(buf); - return count; + print(buf.c_str()); + + return buf.size(); } void ConsoleDialog::printChar(int c) { |