Changeset 5137

Timestamp:

07/25/09 03:57:13 (4 years ago)

Author:

jow

Message:

libs/core: support udata util.striptags(), optimizie copcall implementation

Files:

• luci/trunk/libs/core/luasrc/util.lua (modified) (2 diffs)

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

@@ -216 +216 @@
 -- @return  String with HTML tags stripped of
 function striptags(s)
-    return pcdata(s:gsub("</?[A-Za-z][A-Za-z0-9:_%-]*[^>]*>", " "):gsub("%s+", " "))
+    return pcdata(tostring(s):gsub("</?[A-Za-z][A-Za-z0-9:_%-]*[^>]*>", " "):gsub("%s+", " "))
 end
 
@@ -769 +769 @@
 
 -- Handle return value of protected call
-function handleReturnValue(err, co, status, ...)
+function handleReturnValue(err, co, status, arg1, arg2, arg3, arg4, arg5)
     if not status then
-        return false, err(debug.traceback(co, (...)), ...)
-    end
-    if coroutine.status(co) == 'suspended' then
-        return performResume(err, co, coroutine.yield(...))
-    else
-        return true, ...
-    end
+        return false, err(debug.traceback(co, arg1), arg1, arg2, arg3, arg4, arg5)
+    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))
 end
 
 -- Resume execution of protected function call
-function performResume(err, co, ...)
-    if get_memory_limit and get_memory_limit() > 0 and
-       collectgarbage("count") > (get_memory_limit() * 0.8)
-    then
-        collectgarbage("collect")
-    end
-
-    return handleReturnValue(err, co, coroutine.resume(co, ...))
-end
+function performResume(err, co, arg1, arg2, arg3, arg4, arg5)
+    return handleReturnValue(err, co, coroutine.resume(co, arg1, arg2, arg3, arg4, arg5))
+end