OBVIOUS Use report_unrecognized_option_error in 'demangle' and 'info macro' commands.

Rather than have some local logic to throw an error for an unrecognized option,
use the new cli-utils.h function throwing an error.

At the same time, fix some wrong indentation in info_macro_command
and fix a small bug in 'demangle' error handling:

Without the patch:
  (gdb) demangle -L c++ abcd
  Unrecognized option 'c++' to demangle command.  Try "help demangle".
  (gdb)

With the patch:
  (gdb) demangle -L c++ abcd
  Unrecognized option '-L' to demangle command.  Try "help demangle".

2018-10-27  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* macrocmd.c (info_macro_command): Use report_unrecognized_option_error
	to report a bad option and fix indentation.
	* demangle.c (demangle_command): Use report_unrecognized_option_error
	to report a bad option and correctly report the bad option.
This commit is contained in:
Philippe Waroquiers 2018-10-27 21:25:44 +02:00
parent b50a8b9a91
commit cd948f5b2b
3 changed files with 10 additions and 11 deletions

View File

@ -1,3 +1,10 @@
2018-10-27 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* macrocmd.c (info_macro_command): Use report_unrecognized_option_error
to report a bad option and fix indentation.
* demangle.c (demangle_command): Use report_unrecognized_option_error
to report a bad option and correctly report the bad option.
2018-10-27 Tom Tromey <tom@tromey.com>
PR cli/23364:

View File

@ -180,11 +180,7 @@ demangle_command (const char *args, int from_tty)
else if (strncmp (arg_start, "--", p - arg_start) == 0)
processing_args = 0;
else
{
std::string option = extract_arg (&p);
error (_("Unrecognized option '%s' to demangle command. "
"Try \"help demangle\"."), option.c_str ());
}
report_unrecognized_option_error ("demangle", arg_start);
arg_start = skip_spaces (p);
}

View File

@ -199,13 +199,9 @@ info_macro_command (const char *args, int from_tty)
e.g. Scheme's (defmacro ->foo () "bar\n") */
processing_args = 0;
else
{
error (_("Unrecognized option '%.*s' to info macro command. "
"Try \"help info macro\"."),
int (p - arg_start), arg_start);
}
report_unrecognized_option_error ("info macro", arg_start);
arg_start = skip_spaces (p);
arg_start = skip_spaces (p);
}
name = arg_start;