From 472ffe69a9919a73991a2670762d3bce0b59c9f3 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 9 Nov 2010 19:43:13 +0000 Subject: [PATCH] libs/core: restore original implementation of copcall() and coxpcall(), solves issues with RPC UCI endpoint --- libs/core/luasrc/util.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua index a248026f1..79efa5545 100644 --- a/libs/core/luasrc/util.lua +++ b/libs/core/luasrc/util.lua @@ -787,19 +787,19 @@ function copcall(f, ...) end -- Handle return value of protected call -function handleReturnValue(err, co, status, arg1, arg2, arg3, arg4, arg5) +function handleReturnValue(err, co, status, ...) if not status then - return false, err(debug.traceback(co, arg1), arg1, arg2, arg3, arg4, arg5) + return false, err(debug.traceback(co, (...)), ...) end if coroutine.status(co) ~= 'suspended' then - return true, arg1, arg2, arg3, arg4, arg5 + return true, ... end - return performResume(err, co, coroutine.yield(arg1, arg2, arg3, arg4, arg5)) + return performResume(err, co, coroutine.yield(...)) end -- Resume execution of protected function call -function performResume(err, co, arg1, arg2, arg3, arg4, arg5) - return handleReturnValue(err, co, coroutine.resume(co, arg1, arg2, arg3, arg4, arg5)) +function performResume(err, co, ...) + return handleReturnValue(err, co, coroutine.resume(co, ...)) end -- 2.11.0