Changeset 6410

Timestamp:

11/09/10 20:43:13 (3 years ago)

Author:

jow

Message:

libs/core: restore original implementation of copcall() and coxpcall(), solves issues with RPC UCI endpoint

Files:

• luci/trunk/libs/core/luasrc/util.lua (modified) (1 diff)

luci/trunk/libs/core/luasrc/util.lua

@@ -788 +788 @@
 
 -- 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
-    end
-
-    return performResume(err, co, coroutine.yield(arg1, arg2, arg3, arg4, arg5))
+        return true, ...
+    end
+
+    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))
-end
+function performResume(err, co, ...)
+    return handleReturnValue(err, co, coroutine.resume(co, ...))
+end