Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 05:28:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prefix errors with 'string:', not 'string string:'

Browse source
This commit is contained in:
Michael Steed 2015-09-24 19:21:09 -06:00
parent bcc937e4e0
commit 8abb19aaca
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/builtin_string.cpp
View file

@ -1358,7 +1358,7 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv)
int argc = builtin_count_args(argv); int argc = builtin_count_args(argv);
if (argc <= 1) if (argc <= 1)
{ {
string_error(streams, STRING_ERR_MISSING, argv[0]); streams.err.append_format(_(L"string: Expected subcommand\n"));
builtin_print_help(parser, streams, L"string", streams.err); builtin_print_help(parser, streams, L"string", streams.err);
return BUILTIN_STRING_ERROR; return BUILTIN_STRING_ERROR;
} }
@ -1376,7 +1376,7 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv)
} }
if (subcmd->handler == 0) if (subcmd->handler == 0)
{ {
string_error(streams, _(L"%ls: Unknown subcommand '%ls'\n"), argv[0], argv[1]); streams.err.append_format(_(L"string: Unknown subcommand '%ls'\n"), argv[1]);
builtin_print_help(parser, streams, L"string", streams.err); builtin_print_help(parser, streams, L"string", streams.err);
return BUILTIN_STRING_ERROR; return BUILTIN_STRING_ERROR;
} }