aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-03-30 22:56:57 +0000
committerMax Horn2004-03-30 22:56:57 +0000
commit933aab310067499f96c6e5bc3fb64f1af081707e (patch)
tree53317031f2d4757ae2ca1a90dc0b37a0e9b9828c
parent70545f2c0174a365166ad943c62a6bdd39b2eb91 (diff)
downloadscummvm-rg350-933aab310067499f96c6e5bc3fb64f1af081707e.tar.gz
scummvm-rg350-933aab310067499f96c6e5bc3fb64f1af081707e.tar.bz2
scummvm-rg350-933aab310067499f96c6e5bc3fb64f1af081707e.zip
Use vsprintf instead of vsnprintf: more portable, less safe (but then again, vsnprinft isn't that safe either)
svn-id: r13434
-rw-r--r--scumm/scumm.cpp5
-rw-r--r--sword1/control.cpp5
2 files changed, 2 insertions, 8 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index c5531c665c..7bcda7ea83 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -2597,10 +2597,7 @@ char ScummEngine::displayMessage(const char *altButton, const char *message, ...
va_list va;
va_start(va, message);
- // PLEASE FIX IT, vsnprintf is not portable
-#ifndef _MSC_VER
- vsnprintf(buf, sizeof(buf), message, va);
-#endif
+ vsprintf(buf, message, va);
va_end(va);
GUI::MessageDialog dialog(buf, "OK", altButton);
diff --git a/sword1/control.cpp b/sword1/control.cpp
index f422b41513..038af5c084 100644
--- a/sword1/control.cpp
+++ b/sword1/control.cpp
@@ -681,10 +681,7 @@ int Control::displayMessage(const char *altButton, const char *message, ...) {
va_list va;
va_start(va, message);
- // PLEASE FIX IT, vsnprintf is not portable
-#ifndef _MSC_VER
- vsnprintf(buf, sizeof(buf), message, va);
-#endif
+ vsprintf(buf, message, va);
va_end(va);
GUI::MessageDialog dialog(buf, "OK", altButton);