remove uses of arg in the codebase

master
Pierre Chapuis 2013-01-23 19:13:32 +01:00
parent eea1bc04d7
commit 33b4f0cfc7
2 changed files with 6 additions and 7 deletions

View File

@ -50,7 +50,7 @@ function socket.protect(f)
return function(...)
local co = coroutine.create(f)
while true do
local results = {coroutine.resume(co, base.unpack(arg))}
local results = {coroutine.resume(co, ...)}
local status = table.remove(results, 1)
if not status then
if base.type(results[1]) == 'table' then
@ -104,8 +104,7 @@ local function cowrap(dispatcher, tcp, error)
-- don't override explicitly.
local metat = { __index = function(table, key)
table[key] = function(...)
arg[1] = tcp
return tcp[key](base.unpack(arg))
return tcp[key](tcp,select(2,...))
end
return table[key]
end}

View File

@ -4,24 +4,24 @@ local socket = require"socket.unix"
host = "luasocket"
function pass(...)
local s = string.format(unpack(arg))
local s = string.format(...)
io.stderr:write(s, "\n")
end
function fail(...)
local s = string.format(unpack(arg))
local s = string.format(...)
io.stderr:write("ERROR: ", s, "!\n")
socket.sleep(3)
os.exit()
end
function warn(...)
local s = string.format(unpack(arg))
local s = string.format(...)
io.stderr:write("WARNING: ", s, "\n")
end
function remote(...)
local s = string.format(unpack(arg))
local s = string.format(...)
s = string.gsub(s, "\n", ";")
s = string.gsub(s, "%s+", " ")
s = string.gsub(s, "^%s*", "")