Consolidate setting of current_layout

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

diff --git a/gdb/demangle.c b/gdb/demangle.c
index 8e5065a27b0d68e5bfdd1708a2b9f7802ea768c1..d8b03104d780f799ca62389454075b24ce95c5c0 100644 (file)
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -24,13 +24,11 @@
    to a styles of demangling, and GDB specific.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "cli/cli-utils.h"
+#include "cli/cli-utils.h" /* for skip_to_space */
 #include "command.h"
+#include "gdbcmd.h"
 #include "demangle.h"
 #include "gdb-demangle.h"
-#include "gdbcmd.h"
 #include "language.h"
 
 /* Select the default C++ demangling style to use.  The default is "auto",
@@ -46,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,
@@ -59,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,
@@ -77,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;