/* Basic C++ demangling support for GDB.
- Copyright (C) 1991-2017 Free Software Foundation, Inc.
+ Copyright (C) 1991-2019 Free Software Foundation, Inc.
Written by Fred Fish at Cygnus Support.
#endif
/* See documentation in gdb-demangle.h. */
-int demangle = 1;
+bool demangle = true;
static void
show_demangle (struct ui_file *file, int from_tty,
}
/* See documentation in gdb-demangle.h. */
-int asm_demangle = 0;
+bool asm_demangle = false;
static void
show_asm_demangle (struct ui_file *file, int from_tty,
static const char *current_demangling_style_string;
-/* The array of names of the known demanglyng styles. Generated by
+/* The array of names of the known demangling styles. Generated by
_initialize_demangler from libiberty_demanglers[] array. */
static const char **demangling_style_names;
a malloc'd string, even if it is a null-string. */
static void
-set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c)
+set_demangling_command (const char *ignore,
+ int from_tty, struct cmd_list_element *c)
{
const struct demangler_engine *dem;
int i;
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);
}
name = arg_start;
if (*name == '\0')
- error (_("Usage: demangle [-l language] [--] name"));
+ error (_("Usage: demangle [-l LANGUAGE] [--] NAME"));
if (!lang_name.empty ())
{
add_cmd ("demangle", class_support, demangle_command, _("\
Demangle a mangled name.\n\
-Usage: demangle [-l language] [--] name\n\
+Usage: demangle [-l LANGUAGE] [--] NAME\n\
If LANGUAGE is not specified, NAME is demangled in the current language."),
&cmdlist);
}