[tarantool-patches] [PATCH 2/3] box/console: Drop redundant status parameter from return
Cyrill Gorcunov
gorcunov at gmail.com
Sat Jul 27 01:17:11 MSK 2019
In output_verify_opts and output_parse we return status variable
to point if function processed without error. This is redundant
we can simply return either error or nil, which is enough.
Part-of #3834
---
src/box/lua/console.lua | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/box/lua/console.lua b/src/box/lua/console.lua
index 9258e7bbb..0c521b44a 100644
--- a/src/box/lua/console.lua
+++ b/src/box/lua/console.lua
@@ -72,15 +72,15 @@ end
local function output_verify_opts(fmt, opts)
if opts == nil then
- return true, nil
+ return nil
end
if fmt == "lua" then
if opts ~= "line" and opts ~= "block" then
local msg = 'Wrong option "%s", expecting: line or block.'
- return false, msg:format(opts)
+ return msg:format(opts)
end
end
- return true, nil
+ return nil
end
local function output_parse(value)
@@ -92,23 +92,23 @@ local function output_parse(value)
end
for k, _ in pairs(output_handlers) do
if k == fmt then
- local status, err = output_verify_opts(fmt, opts)
- if status ~= true then
- return false, err
+ local err = output_verify_opts(fmt, opts)
+ if err then
+ return err
end
- return true, nil, fmt, opts
+ return nil, fmt, opts
end
end
local msg = 'Invalid format "%s", supported languages: lua and yaml.'
- return false, msg:format(value)
+ return msg:format(value)
end
local function set_default_output(value)
if value == nil then
error("Nil output value passed")
end
- local status, err, fmt, opts = output_parse(value)
- if status ~= true then
+ local err, fmt, opts = output_parse(value)
+ if err then
error(err)
end
default_output_format["fmt"] = fmt
@@ -180,8 +180,8 @@ local function set_language(storage, value)
end
local function set_output(storage, value)
- local status, err, fmt, opts = output_parse(value)
- if status ~= true then
+ local err, fmt, opts = output_parse(value)
+ if err then
return error(err)
end
output_save(fmt, opts)
--
2.20.1
More information about the Tarantool-patches
mailing list