[Scummvm-cvs-logs] scummvm master -> ad38029e6e10db27652e2f79c9c68b87593ebffa

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ad38029e6e TONY: Remove varargs from mpalQueryCORO(). CID 1002105


Commit: ad38029e6e10db27652e2f79c9c68b87593ebffa
    https://github.com/scummvm/scummvm/commit/ad38029e6e10db27652e2f79c9c68b87593ebffa
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-06-10T11:07:33-07:00

Commit Message:
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.

Changed paths:
    engines/tony/mpal/mpal.cpp
    engines/tony/mpal/mpal.h



diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 1de5c68..fff8676 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 779bdd6..2d22ee8 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.