From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id EE8E524515 for ; Thu, 5 Sep 2019 17:29:28 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eVDCzghD8jGN for ; Thu, 5 Sep 2019 17:29:28 -0400 (EDT) Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id A930D244FF for ; Thu, 5 Sep 2019 17:29:28 -0400 (EDT) Received: by mail-lf1-f67.google.com with SMTP id u29so3241517lfk.7 for ; Thu, 05 Sep 2019 14:29:28 -0700 (PDT) From: Cyrill Gorcunov Subject: [tarantool-patches] [PATCH 6/6] box/console: Rename output_parse to parse_output Date: Fri, 6 Sep 2019 00:28:15 +0300 Message-Id: <20190905212815.7311-7-gorcunov@gmail.com> In-Reply-To: <20190905212815.7311-1-gorcunov@gmail.com> References: <20190905212815.7311-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: tml Cc: Konstantin Osipov , Alexander Turenko , Cyrill Gorcunov To be consistent in naming scheme, for example we already have parse_operators. Part-of #3834 --- src/box/lua/console.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/box/lua/console.lua b/src/box/lua/console.lua index c1e8daaf8..75cad9de2 100644 --- a/src/box/lua/console.lua +++ b/src/box/lua/console.lua @@ -99,7 +99,7 @@ local function output_verify_opts(fmt, opts) return nil end -local function output_parse(value) +local function parse_output(value) local fmt, opts if value:match("([^,]+),([^,]+)") ~= nil then fmt, opts = value:match("([^,]+),([^,]+)") @@ -123,7 +123,7 @@ local function set_default_output(value) if value == nil then error("Nil output value passed") end - local err, fmt, opts = output_parse(value) + local err, fmt, opts = parse_output(value) if err then error(err) end @@ -234,7 +234,7 @@ local function set_language(storage, value) end local function set_output(storage, value) - local err, fmt, opts = output_parse(value) + local err, fmt, opts = parse_output(value) if err then return error(err) end @@ -401,7 +401,7 @@ local text_connection_mt = { end local nr_items, items = parse_operators(command) if nr_items == 3 then - local err, fmt, opts = output_parse(items[3]) + local err, fmt, opts = parse_output(items[3]) if not err then self.eos = output_eos[fmt] end -- 2.20.1