From 8abb19aaca21f1a6b0d422f8f16ab11e38389f58 Mon Sep 17 00:00:00 2001 From: Michael Steed Date: Thu, 24 Sep 2015 19:21:09 -0600 Subject: Prefix errors with 'string:', not 'string string:' --- src/builtin_string.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/builtin_string.cpp') diff --git a/src/builtin_string.cpp b/src/builtin_string.cpp index 47a3f469..22f16fc6 100644 --- a/src/builtin_string.cpp +++ b/src/builtin_string.cpp @@ -1358,7 +1358,7 @@ int builtin_string(parser_t &parser, io_streams_t &streams, wchar_t **argv) int argc = builtin_count_args(argv); 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); 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) { - 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); return BUILTIN_STRING_ERROR; } -- cgit v1.2.3