From: Olga Arkhangelskaia <arkholga@tarantool.org> To: tarantool-patches@freelists.org Cc: Olga Arkhangelskaia <arkholga@tarantool.org> Subject: [tarantool-patches] [PATCH] box: removed unnecessary check of log string Date: Tue, 24 Jul 2018 14:19:35 +0300 [thread overview] Message-ID: <20180724111935.98428-1-arkholga@tarantool.org> (raw) This check happens twice. The patch simply removes check. --- https://github.com/tarantool/tarantool/tree/OKriw/Remove_unnecessary_check src/box/box.cc | 5 ----- src/say.c | 18 ------------------ src/say.h | 8 -------- 3 files changed, 31 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 3ed2a4a44..b6c22b081 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -362,11 +362,6 @@ box_check_say() diag_last_error(diag_get())->errmsg); } - if (say_check_init_str(log) == -1) { - - diag_raise(); - } - if (type == SAY_LOGGER_SYSLOG) { struct say_syslog_opts opts; if (say_parse_syslog_opts(log, &opts) < 0) { diff --git a/src/say.c b/src/say.c index 287ec5000..ac221dd19 100644 --- a/src/say.c +++ b/src/say.c @@ -960,24 +960,6 @@ write_to_syslog(struct log *log, int total) * Init string parser(s) */ -int -say_check_init_str(const char *str) -{ - enum say_logger_type type; - if (say_parse_logger_type(&str, &type)) { - diag_set(IllegalParams, logger_syntax_reminder); - return -1; - } - if (type == SAY_LOGGER_SYSLOG) { - struct say_syslog_opts opts; - - if (say_parse_syslog_opts(str, &opts) < 0) - return -1; - say_free_syslog_opts(&opts); - } - return 0; -} - /** * @retval string after prefix if a prefix is found, * *str also is advanced to the prefix diff --git a/src/say.h b/src/say.h index f4c6b8eb9..2c2395fe0 100644 --- a/src/say.h +++ b/src/say.h @@ -372,14 +372,6 @@ CFORMAT(printf, 5, 0) extern sayfunc_t _say; #define log_say_syserror(log, format, ...) \ log_say_level(log, S_SYSERROR, strerror(errno), format, ##__VA_ARGS__) -/** - * validates logger init string; - * @returns 0 if validation passed or -1 - * with an error message written to diag - */ -int -say_check_init_str(const char *str); - /* internals, for unit testing */ /** -- 2.14.3 (Apple Git-98)
next reply other threads:[~2018-07-24 11:19 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-24 11:19 Olga Arkhangelskaia [this message] 2018-07-24 17:37 ` [tarantool-patches] " Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180724111935.98428-1-arkholga@tarantool.org \ --to=arkholga@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH] box: removed unnecessary check of log string' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox