Consolidate setting of current_layout

[deliverable/binutils-gdb.git] / gdb / demangle.c

diff --git a/gdb/demangle.c b/gdb/demangle.c
index 1a97fb7f281ef1e9a3c2109f64a01295264010e6..d8b03104d780f799ca62389454075b24ce95c5c0 100644 (file)
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -1,6 +1,6 @@
 /* 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.
 
@@ -44,7 +44,7 @@
 #endif
 
 /* See documentation in gdb-demangle.h.  */
-int demangle = 1;
+bool demangle = true;
 
 static void
 show_demangle (struct ui_file *file, int from_tty,
@@ -57,7 +57,7 @@ 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,
@@ -75,7 +75,7 @@ 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;
@@ -104,7 +104,8 @@ show_demangling_style_names(struct ui_file *file, int from_tty,
    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;
@@ -179,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);
     }
@@ -191,7 +188,7 @@ demangle_command (const char *args, int from_tty)
   name = arg_start;
 
   if (*name == '\0')
-    error (_("Usage: demangle [-l language] [--] name"));
+    error (_("Usage: demangle [-l LANGUAGE] [--] NAME"));
 
   if (!lang_name.empty ())
     {
@@ -265,7 +262,7 @@ Use `set demangle-style' without arguments for a list of demangling styles."),
 
   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);
 }