diff options
author | Torbjörn Andersson | 2013-06-10 20:05:21 +0200 |
---|---|---|
committer | Torbjörn Andersson | 2013-06-10 20:07:33 +0200 |
commit | ad38029e6e10db27652e2f79c9c68b87593ebffa (patch) | |
tree | 71b8c36608fb8209d370f70bab09413984fb5aab | |
parent | 36a88d2f7229bc6c92b5d7df0eed56dabc911f7e (diff) | |
download | scummvm-rg350-ad38029e6e10db27652e2f79c9c68b87593ebffa.tar.gz scummvm-rg350-ad38029e6e10db27652e2f79c9c68b87593ebffa.tar.bz2 scummvm-rg350-ad38029e6e10db27652e2f79c9c68b87593ebffa.zip |
TONY: Remove varargs from mpalQueryCORO(). CID 1002105
It didn't always reach va_end(), but rather than adding a call it
makes more sense to just drop the varargs from it, since it didn't
use it anyway.
-rw-r--r-- | engines/tony/mpal/mpal.cpp | 7 | ||||
-rw-r--r-- | engines/tony/mpal/mpal.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp index 1de5c6850c..fff8676a89 100644 --- a/engines/tony/mpal/mpal.cpp +++ b/engines/tony/mpal/mpal.cpp @@ -1876,14 +1876,11 @@ MpalHandle mpalQueryHANDLE(uint16 wQueryType, ...) { * @remarks This is the specialised version of the original single mpalQuery * method that needs to run within a co-routine context. */ -void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...) { +void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet) { CORO_BEGIN_CONTEXT; uint32 dwRet; CORO_END_CONTEXT(_ctx); - va_list v; - va_start(v, dwRet); - CORO_BEGIN_CODE(_ctx); if (wQueryType == MPQ_DIALOG_WAITFORCHOICE) { @@ -1909,8 +1906,6 @@ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...) { } CORO_END_CODE; - - va_end(v); } /** diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h index 779bdd6188..2d22ee8faf 100644 --- a/engines/tony/mpal/mpal.h +++ b/engines/tony/mpal/mpal.h @@ -417,7 +417,7 @@ MpalHandle mpalQueryHANDLE(uint16 wQueryType, ...); * @remarks This is the specialised version of the original single mpalQuery * method that needs to run within a co-routine context. */ -void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...); +void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet); /** * Execute a script. The script runs on multitasking by a thread. |