Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 20:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

lint: multiple unary operator

Browse source
This commit is contained in:
Kurtis Rader 2016-11-03 16:37:26 -07:00
parent 4e505efc50
commit de87419df9
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/builtin.cpp
View file

@ -908,7 +908,7 @@ static int builtin_generic(parser_t &parser, io_streams_t &streams, wchar_t **ar
/// Return a definition of the specified function. Used by the functions builtin. /// Return a definition of the specified function. Used by the functions builtin.
static wcstring functions_def(const wcstring &name) { static wcstring functions_def(const wcstring &name) {
CHECK(!name.empty(), L""); CHECK(!name.empty(), L""); //!OCLINT(multiple unary operator)
wcstring out; wcstring out;
wcstring desc, def; wcstring desc, def;
function_get_desc(name, &desc); function_get_desc(name, &desc);
@ -1090,7 +1090,8 @@ static int builtin_functions(parser_t &parser, io_streams_t &streams, wchar_t **
} }
// Erase, desc, query, copy and list are mutually exclusive. // Erase, desc, query, copy and list are mutually exclusive.
if ((erase + (!!desc) + list + query + copy) > 1) { int describe = desc ? 1 : 0;
if (erase + describe + list + query + copy > 1) {
streams.err.append_format(_(L"%ls: Invalid combination of options\n"), argv[0]); streams.err.append_format(_(L"%ls: Invalid combination of options\n"), argv[0]);
builtin_print_help(parser, streams, argv[0], streams.err); builtin_print_help(parser, streams, argv[0], streams.err);