gdb/

	* dwarf2loc.c (entry_values_debug): Add 'unsigned'.
	(_initialize_dwarf2loc): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* dwarf2loc.h: Update the declaration of 'entry_values_debug'.
	* dwarf2read.c (dwarf2_die_debug): Add 'unsigned'.
	(_initialize_dwarf2_read): Call add_setshow_zuinteger_cmd
	instead of add_setshow_zinteger_cmd.
	* darwin-nat.c (dwarwin_debug_flag): Add 'unsigned'.
	(_initialize_darwin_inferior): Call add_setshow_zuinteger_cmd
	instead of add_setshow_zinteger_cmd.
	* frame.c (frame_debug): Add 'unsigned'.
	(_intialize_frame): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* frame.h: Update the declaration of 'frame_debug'.
	* gdbtypes.c (overload_debug): Add 'unsigned'.
	(_initialize_gdbtypes): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* inferior.h: Update declaration of 'debug_infrun'.
	* infrun.c (debug_infrun): Add 'unsigned'.
	(_initialize_infrun): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* jit.c (jit_debug): Add 'unsigned'.
	(_initialize_jit): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* linux-nat.c (debug_linux_nat): Add 'unsigned'.
	(_initialize_linux_nat): Call add_setshow_zuinteger_cmd
	instead of add_setshow_zinteger_cmd.
	* linux-thread-db.c (libthread_db_debug): Add 'unsigned'.
	(_initialize_thread_db): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* machoread.c (mach_o_debug_level): Add 'unsigned'.
	(_initialize_machoread): Call add_setshow_zuinteger_cmd
	instead of add_setshow_zinteger_cmd.
	* mi/mi-cmd-var.c: Update the declaration of 'varobjdebug'.
	* microblaze-tdep.c (microblaze_debug_flag): Add 'unsigned'.
	(_initialize_microblaze_tdep): Call add_setshow_zuinteger_cmd
	intead of add_setshow_zinteger_cmd.
	* mips-tdep.c (mips_debug): Add 'unsigned'.
	(_initialize_mips_tdep): Call add_setshow_zuinteger_cmd
	instead of add_setshow_zinteger_cmd.
	* monitor.c (monitor_debug): Add 'unsigned'.
	(_initialize_remote_monitors): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* observer.c (observer_debug): Add 'unsigned'.
	(_initialize_observer): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* parse.c (expressiondebug): Add 'unsigned'.
	(_initialize_parse): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* record.c (record_debug): Add 'unsigned'.
	(_initialize_record): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* record.h: Update the declaration of 'record_debug'.
	* stap-probe.c (stap_expression_debug): Add 'unsigned'.
	(_initialize_stap_probe): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* serial.c (global_serial_debug_p): Add 'unsigned'.
	(_initialize_serial): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* solib-dsbt.c (solib_dsbt_debug): Add 'unsigned'.
	(_initialize_dsbt_solib): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* solib-frv.c (solib_frv_debug): Add 'unsigned'.
	(_initialize_frv_solib): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* target.c (targetdebug): Add 'unsigned'.
	(initialize_targets): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* valops.c (overload_debug): Add 'unsigned'.
	* varobj.c (varobjdebug): Add 'unsigned'.
	(_initialize_varobj): Call add_setshow_zuinteger_cmd instead of
	add_setshow_zinteger_cmd.
	* xtensa-tdep.c (xtensa_debug_level): Add 'unsigned'.
	(_initialize_xtensa_tdep): Call add_setshow_zuinteger_cmd
	instead of add_setshow_zinteger_cmd.

	* arch-utils.h: Remove the declaration of 'gdbarch_debug'.
	* gdbarch.sh (gdbarch_debug): Add 'unsigned'.
	(extern void _initialize_gdbarch): Call add_setshow_zuinteger_cmd
	instead of add_setshow_zinteger_cmd.
	* gdbarch.c, gdbarch.h: Re-generated.

34 files changed, 255 insertions, 174 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d62a76c..f284746 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,89 @@
 2012-08-02  Yao Qi  <yao@codesourcery.com>
 
+	* dwarf2loc.c (entry_values_debug): Add 'unsigned'.
+	(_initialize_dwarf2loc): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* dwarf2loc.h: Update the declaration of 'entry_values_debug'.
+	* dwarf2read.c (dwarf2_die_debug): Add 'unsigned'.
+	(_initialize_dwarf2_read): Call add_setshow_zuinteger_cmd
+	instead of add_setshow_zinteger_cmd.
+	* darwin-nat.c (dwarwin_debug_flag): Add 'unsigned'.
+	(_initialize_darwin_inferior): Call add_setshow_zuinteger_cmd
+	instead of add_setshow_zinteger_cmd.
+	* frame.c (frame_debug): Add 'unsigned'.
+	(_intialize_frame): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* frame.h: Update the declaration of 'frame_debug'.
+	* gdbtypes.c (overload_debug): Add 'unsigned'.
+	(_initialize_gdbtypes): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* inferior.h: Update declaration of 'debug_infrun'.
+	* infrun.c (debug_infrun): Add 'unsigned'.
+	(_initialize_infrun): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* jit.c (jit_debug): Add 'unsigned'.
+	(_initialize_jit): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* linux-nat.c (debug_linux_nat): Add 'unsigned'.
+	(_initialize_linux_nat): Call add_setshow_zuinteger_cmd
+	instead of add_setshow_zinteger_cmd.
+	* linux-thread-db.c (libthread_db_debug): Add 'unsigned'.
+	(_initialize_thread_db): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* machoread.c (mach_o_debug_level): Add 'unsigned'.
+	(_initialize_machoread): Call add_setshow_zuinteger_cmd
+	instead of add_setshow_zinteger_cmd.
+	* mi/mi-cmd-var.c: Update the declaration of 'varobjdebug'.
+	* microblaze-tdep.c (microblaze_debug_flag): Add 'unsigned'.
+	(_initialize_microblaze_tdep): Call add_setshow_zuinteger_cmd
+	intead of add_setshow_zinteger_cmd.
+	* mips-tdep.c (mips_debug): Add 'unsigned'.
+	(_initialize_mips_tdep): Call add_setshow_zuinteger_cmd
+	instead of add_setshow_zinteger_cmd.
+	* monitor.c (monitor_debug): Add 'unsigned'.
+	(_initialize_remote_monitors): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* observer.c (observer_debug): Add 'unsigned'.
+	(_initialize_observer): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* parse.c (expressiondebug): Add 'unsigned'.
+	(_initialize_parse): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* record.c (record_debug): Add 'unsigned'.
+	(_initialize_record): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* record.h: Update the declaration of 'record_debug'.
+	* stap-probe.c (stap_expression_debug): Add 'unsigned'.
+	(_initialize_stap_probe): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* serial.c (global_serial_debug_p): Add 'unsigned'.
+	(_initialize_serial): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* solib-dsbt.c (solib_dsbt_debug): Add 'unsigned'.
+	(_initialize_dsbt_solib): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* solib-frv.c (solib_frv_debug): Add 'unsigned'.
+	(_initialize_frv_solib): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* target.c (targetdebug): Add 'unsigned'.
+	(initialize_targets): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* valops.c (overload_debug): Add 'unsigned'.
+	* varobj.c (varobjdebug): Add 'unsigned'.
+	(_initialize_varobj): Call add_setshow_zuinteger_cmd instead of
+	add_setshow_zinteger_cmd.
+	* xtensa-tdep.c (xtensa_debug_level): Add 'unsigned'.
+	(_initialize_xtensa_tdep): Call add_setshow_zuinteger_cmd
+	instead of add_setshow_zinteger_cmd.
+
+	* arch-utils.h: Remove the declaration of 'gdbarch_debug'.
+	* gdbarch.sh (gdbarch_debug): Add 'unsigned'.
+	(extern void _initialize_gdbarch): Call add_setshow_zuinteger_cmd
+	instead of add_setshow_zinteger_cmd.
+	* gdbarch.c, gdbarch.h: Re-generated.
+
+2012-08-02  Yao Qi  <yao@codesourcery.com>
+
 	* nto-tdep.c: Don't include cli/cli-decode.h and
 	cli/cli-cmds.h.
 	(_initialize_nto_tdep): Remove.
diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index ef4cb26..bed207f 100644
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -27,9 +27,6 @@ struct minimal_symbol;
 struct type;
 struct gdbarch_info;
 
-/* gdbarch trace variable */
-extern int gdbarch_debug;
-
 /* An implementation of gdbarch_displaced_step_copy_insn for
    processors that don't need to modify the instruction before
    single-stepping the displaced copy.
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 26ee23a..252fe3e 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -145,7 +145,7 @@ static struct inferior *darwin_inf_fake_stop;
 #define PAGE_ROUND(x) PAGE_TRUNC((x) + mach_page_size - 1)
 
 /* This controls output of inferior debugging.  */
-static int darwin_debug_flag = 0;
+static unsigned int darwin_debug_flag = 0;
 
 /* Create a __TEXT __info_plist section in the executable so that gdb could
    be signed.  This is required to get an authorization for task_for_pid.
@@ -2057,12 +2057,12 @@ _initialize_darwin_inferior (void)
   inferior_debug (2, _("GDB task: 0x%lx, pid: %d\n"), mach_task_self (),
                   getpid ());
 
-  add_setshow_zinteger_cmd ("darwin", class_obscure,
-			    &darwin_debug_flag, _("\
+  add_setshow_zuinteger_cmd ("darwin", class_obscure,
+			     &darwin_debug_flag, _("\
 Set if printing inferior communication debugging statements."), _("\
 Show if printing inferior communication debugging statements."), NULL,
-			    NULL, NULL,
-			    &setdebuglist, &showdebuglist);
+			     NULL, NULL,
+			     &setdebuglist, &showdebuglist);
 
   add_setshow_boolean_cmd ("mach-exceptions", class_support,
 			   &enable_mach_exceptions, _("\
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 31c6a3e..e8d39fe 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -458,7 +458,7 @@ dwarf_expr_get_base_type (struct dwarf_expr_context *ctx,
 
 /* See dwarf2loc.h.  */
 
-int entry_values_debug = 0;
+unsigned int entry_values_debug = 0;
 
 /* Helper to set entry_values_debug.  */
 
@@ -4146,16 +4146,16 @@ extern initialize_file_ftype _initialize_dwarf2loc;
 void
 _initialize_dwarf2loc (void)
 {
-  add_setshow_zinteger_cmd ("entry-values", class_maintenance,
-			    &entry_values_debug,
-			    _("Set entry values and tail call frames "
-			      "debugging."),
-			    _("Show entry values and tail call frames "
-			      "debugging."),
-			    _("When non-zero, the process of determining "
-			      "parameter values from function entry point "
-			      "and tail call frames will be printed."),
-			    NULL,
-			    show_entry_values_debug,
-			    &setdebuglist, &showdebuglist);
+  add_setshow_zuinteger_cmd ("entry-values", class_maintenance,
+			     &entry_values_debug,
+			     _("Set entry values and tail call frames "
+			       "debugging."),
+			     _("Show entry values and tail call frames "
+			       "debugging."),
+			     _("When non-zero, the process of determining "
+			       "parameter values from function entry point "
+			       "and tail call frames will be printed."),
+			     NULL,
+			     show_entry_values_debug,
+			     &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/dwarf2loc.h b/gdb/dwarf2loc.h
index 326838f..0f10767 100644
--- a/gdb/dwarf2loc.h
+++ b/gdb/dwarf2loc.h
@@ -33,7 +33,7 @@ struct axs_value;
    dwarf2read.c and dwarf2loc.c.  */
 
 /* `set debug entry-values' setting.  */
-extern int entry_values_debug;
+extern unsigned int entry_values_debug;
 
 /* Return the OBJFILE associated with the compilation unit CU.  If CU
    came from a separate debuginfo file, then the master objfile is
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 8295857..04c6ed0 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -79,7 +79,7 @@ DEF_VEC_P (symbolp);
 static int dwarf2_read_debug = 0;
 
 /* When non-zero, dump DIEs after they are read in.  */
-static int dwarf2_die_debug = 0;
+static unsigned int dwarf2_die_debug = 0;
 
 /* When non-zero, cross-check physname against demangler.  */
 static int check_physname = 0;
@@ -19640,14 +19640,14 @@ and symtab expansion."),
 			    NULL,
 			    &setdebuglist, &showdebuglist);
 
-  add_setshow_zinteger_cmd ("dwarf2-die", no_class, &dwarf2_die_debug, _("\
+  add_setshow_zuinteger_cmd ("dwarf2-die", no_class, &dwarf2_die_debug, _("\
 Set debugging of the dwarf2 DIE reader."), _("\
 Show debugging of the dwarf2 DIE reader."), _("\
 When enabled (non-zero), DIEs are dumped after they are read in.\n\
 The value is the maximum depth to print."),
-			    NULL,
-			    NULL,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     NULL,
+			     &setdebuglist, &showdebuglist);
 
   add_setshow_boolean_cmd ("check-physname", no_class, &check_physname, _("\
 Set cross-checking of \"physname\" code against demangler."), _("\
diff --git a/gdb/frame.c b/gdb/frame.c
index e012f2d..278269d 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -165,7 +165,7 @@ frame_stash_invalidate (void)
 
 /* Flag to control debugging.  */
 
-int frame_debug;
+unsigned int frame_debug;
 static void
 show_frame_debug (struct ui_file *file, int from_tty,
 		  struct cmd_list_element *c, const char *value)
@@ -2500,11 +2500,11 @@ Zero is unlimited."),
 			   &show_backtrace_cmdlist);
 
   /* Debug this files internals.  */
-  add_setshow_zinteger_cmd ("frame", class_maintenance, &frame_debug,  _("\
+  add_setshow_zuinteger_cmd ("frame", class_maintenance, &frame_debug,  _("\
 Set frame debugging."), _("\
 Show frame debugging."), _("\
 When non-zero, frame specific internal debugging is enabled."),
-			    NULL,
-			    show_frame_debug,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     show_frame_debug,
+			     &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/frame.h b/gdb/frame.h
index 7b42b56..532fb26 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -151,7 +151,7 @@ extern const struct frame_id outer_frame_id;
 
 /* Flag to control debugging.  */
 
-extern int frame_debug;
+extern unsigned int frame_debug;
 
 /* Construct a frame ID.  The first parameter is the frame's constant
    stack address (typically the outer-bound), and the second the
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 8c73db2..e4fe267 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -61,7 +61,7 @@ static void alloc_gdbarch_data (struct gdbarch *);
 #ifndef GDBARCH_DEBUG
 #define GDBARCH_DEBUG 0
 #endif
-int gdbarch_debug = GDBARCH_DEBUG;
+unsigned int gdbarch_debug = GDBARCH_DEBUG;
 static void
 show_gdbarch_debug (struct ui_file *file, int from_tty,
                     struct cmd_list_element *c, const char *value)
@@ -4684,7 +4684,7 @@ extern void _initialize_gdbarch (void);
 void
 _initialize_gdbarch (void)
 {
-  add_setshow_zinteger_cmd ("arch", class_maintenance, &gdbarch_debug, _("\
+  add_setshow_zuinteger_cmd ("arch", class_maintenance, &gdbarch_debug, _("\
 Set architecture debugging."), _("\
 Show architecture debugging."), _("\
 When non-zero, architecture debugging is enabled."),
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index f2b186a..696bf14 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1427,7 +1427,7 @@ extern void set_gdbarch_from_file (bfd *);
 extern void initialize_current_architecture (void);
 
 /* gdbarch trace variable */
-extern int gdbarch_debug;
+extern unsigned int gdbarch_debug;
 
 extern void gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file);
 
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 05c0035..c20b8ca 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1376,7 +1376,7 @@ extern void set_gdbarch_from_file (bfd *);
 extern void initialize_current_architecture (void);
 
 /* gdbarch trace variable */
-extern int gdbarch_debug;
+extern unsigned int gdbarch_debug;
 
 extern void gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file);
 
@@ -1422,7 +1422,7 @@ static void alloc_gdbarch_data (struct gdbarch *);
 #ifndef GDBARCH_DEBUG
 #define GDBARCH_DEBUG 0
 #endif
-int gdbarch_debug = GDBARCH_DEBUG;
+unsigned int gdbarch_debug = GDBARCH_DEBUG;
 static void
 show_gdbarch_debug (struct ui_file *file, int from_tty,
                     struct cmd_list_element *c, const char *value)
@@ -2291,7 +2291,7 @@ extern void _initialize_gdbarch (void);
 void
 _initialize_gdbarch (void)
 {
-  add_setshow_zinteger_cmd ("arch", class_maintenance, &gdbarch_debug, _("\\
+  add_setshow_zuinteger_cmd ("arch", class_maintenance, &gdbarch_debug, _("\\
 Set architecture debugging."), _("\\
 Show architecture debugging."), _("\\
 When non-zero, architecture debugging is enabled."),
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 8142ab9..0ea4df1 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -122,7 +122,7 @@ show_opaque_type_resolution (struct ui_file *file, int from_tty,
 		    value);
 }
 
-int overload_debug = 0;
+unsigned int overload_debug = 0;
 static void
 show_overload_debug (struct ui_file *file, int from_tty,
 		     struct cmd_list_element *c, const char *value)
@@ -4044,14 +4044,14 @@ _initialize_gdbtypes (void)
   gdbtypes_data = gdbarch_data_register_post_init (gdbtypes_post_init);
   objfile_type_data = register_objfile_data ();
 
-  add_setshow_zinteger_cmd ("overload", no_class, &overload_debug,
-			    _("Set debugging of C++ overloading."),
-			    _("Show debugging of C++ overloading."),
-			    _("When enabled, ranking of the "
-			      "functions is displayed."),
-			    NULL,
-			    show_overload_debug,
-			    &setdebuglist, &showdebuglist);
+  add_setshow_zuinteger_cmd ("overload", no_class, &overload_debug,
+			     _("Set debugging of C++ overloading."),
+			     _("Show debugging of C++ overloading."),
+			     _("When enabled, ranking of the "
+			       "functions is displayed."),
+			     NULL,
+			     show_overload_debug,
+			     &setdebuglist, &showdebuglist);
 
   /* Add user knob for controlling resolution of opaque types.  */
   add_setshow_boolean_cmd ("opaque-type-resolution", class_support,
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 3945962..86402f1 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -201,7 +201,7 @@ extern char *construct_inferior_arguments (int, char **);
 
 /* From infrun.c */
 
-extern int debug_infrun;
+extern unsigned int debug_infrun;
 
 extern int stop_on_solib_events;
 
diff --git a/gdb/infrun.c b/gdb/infrun.c
index efc4162..cf6c062 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -140,7 +140,7 @@ show_debug_displaced (struct ui_file *file, int from_tty,
   fprintf_filtered (file, _("Displace stepping debugging is %s.\n"), value);
 }
 
-int debug_infrun = 0;
+unsigned int debug_infrun = 0;
 static void
 show_debug_infrun (struct ui_file *file, int from_tty,
 		   struct cmd_list_element *c, const char *value)
@@ -7110,13 +7110,13 @@ There is no `stop' command, but you can set a hook on `stop'.\n\
 This allows you to set a list of commands to be run each time execution\n\
 of the program stops."), &cmdlist);
 
-  add_setshow_zinteger_cmd ("infrun", class_maintenance, &debug_infrun, _("\
+  add_setshow_zuinteger_cmd ("infrun", class_maintenance, &debug_infrun, _("\
 Set inferior debugging."), _("\
 Show inferior debugging."), _("\
 When non-zero, inferior specific debugging is enabled."),
-			    NULL,
-			    show_debug_infrun,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     show_debug_infrun,
+			     &setdebuglist, &showdebuglist);
 
   add_setshow_boolean_cmd ("displaced", class_maintenance,
 			   &debug_displaced, _("\
diff --git a/gdb/jit.c b/gdb/jit.c
index cdd9f49..2ba6d7e 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -60,7 +60,7 @@ static struct gdbarch_data *jit_gdbarch_data;
 
 /* Non-zero if we want to see trace of jit level stuff.  */
 
-static int jit_debug = 0;
+static unsigned int jit_debug = 0;
 
 static void
 show_jit_debug (struct ui_file *file, int from_tty,
@@ -1402,13 +1402,13 @@ _initialize_jit (void)
 {
   jit_reader_dir = relocate_gdb_directory (JIT_READER_DIR,
                                            JIT_READER_DIR_RELOCATABLE);
-  add_setshow_zinteger_cmd ("jit", class_maintenance, &jit_debug,
-			    _("Set JIT debugging."),
-			    _("Show JIT debugging."),
-			    _("When non-zero, JIT debugging is enabled."),
-			    NULL,
-			    show_jit_debug,
-			    &setdebuglist, &showdebuglist);
+  add_setshow_zuinteger_cmd ("jit", class_maintenance, &jit_debug,
+			     _("Set JIT debugging."),
+			     _("Show JIT debugging."),
+			     _("When non-zero, JIT debugging is enabled."),
+			     NULL,
+			     show_jit_debug,
+			     &setdebuglist, &showdebuglist);
 
   observer_attach_inferior_exit (jit_inferior_exit_hook);
   jit_objfile_data =
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index c25f155..9844b0c 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -201,7 +201,7 @@ static LONGEST (*super_xfer_partial) (struct target_ops *,
 				      const gdb_byte *,
 				      ULONGEST, LONGEST);
 
-static int debug_linux_nat;
+static unsigned int debug_linux_nat;
 static void
 show_debug_linux_nat (struct ui_file *file, int from_tty,
 		      struct cmd_list_element *c, const char *value)
@@ -5194,14 +5194,14 @@ extern initialize_file_ftype _initialize_linux_nat;
 void
 _initialize_linux_nat (void)
 {
-  add_setshow_zinteger_cmd ("lin-lwp", class_maintenance,
-			    &debug_linux_nat, _("\
+  add_setshow_zuinteger_cmd ("lin-lwp", class_maintenance,
+			     &debug_linux_nat, _("\
 Set debugging of GNU/Linux lwp module."), _("\
 Show debugging of GNU/Linux lwp module."), _("\
 Enables printf debugging output."),
-			    NULL,
-			    show_debug_linux_nat,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     show_debug_linux_nat,
+			     &setdebuglist, &showdebuglist);
 
   /* Save this mask as the default.  */
   sigprocmask (SIG_SETMASK, NULL, &normal_mask);
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index ef704ec..2c16e02 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -102,7 +102,7 @@ set_libthread_db_search_path (char *ignored, int from_tty,
 
 /* If non-zero, print details of libthread_db processing.  */
 
-static int libthread_db_debug;
+static unsigned int libthread_db_debug;
 
 static void
 show_libthread_db_debug (struct ui_file *file, int from_tty,
@@ -2076,14 +2076,14 @@ Setting the search path to an empty list resets it to its default value."),
 			    NULL,
 			    &setlist, &showlist);
 
-  add_setshow_zinteger_cmd ("libthread-db", class_maintenance,
-			    &libthread_db_debug, _("\
+  add_setshow_zuinteger_cmd ("libthread-db", class_maintenance,
+			     &libthread_db_debug, _("\
 Set libthread-db debugging."), _("\
 Show libthread-db debugging."), _("\
 When non-zero, libthread-db debugging is enabled."),
-			    NULL,
-			    show_libthread_db_debug,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     show_libthread_db_debug,
+			     &setdebuglist, &showdebuglist);
 
   add_setshow_boolean_cmd ("libthread-db", class_support,
 			   &auto_load_thread_db, _("\
diff --git a/gdb/machoread.c b/gdb/machoread.c
index b940e8a..2c398fa 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -39,7 +39,7 @@
 #include <string.h>
 
 /* If non-zero displays debugging message.  */
-static int mach_o_debug_level = 0;
+static unsigned int mach_o_debug_level = 0;
 
 /* Dwarf debugging information are never in the final executable.  They stay
    in object files and the executable contains the list of object files read
@@ -1046,10 +1046,10 @@ _initialize_machoread ()
 {
   add_symtab_fns (&macho_sym_fns);
 
-  add_setshow_zinteger_cmd ("mach-o", class_obscure,
-			    &mach_o_debug_level,
-			    _("Set if printing Mach-O symbols processing."),
-			    _("Show if printing Mach-O symbols processing."),
-			    NULL, NULL, NULL,
-			    &setdebuglist, &showdebuglist);
+  add_setshow_zuinteger_cmd ("mach-o", class_obscure,
+			     &mach_o_debug_level,
+			     _("Set if printing Mach-O symbols processing."),
+			     _("Show if printing Mach-O symbols processing."),
+			     NULL, NULL, NULL,
+			     &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 0603679..5d7081f 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -34,7 +34,7 @@ const char mi_no_values[] = "--no-values";
 const char mi_simple_values[] = "--simple-values";
 const char mi_all_values[] = "--all-values";
 
-extern int varobjdebug;		/* defined in varobj.c.  */
+extern unsigned int varobjdebug;		/* defined in varobj.c.  */
 
 static void varobj_update_one (struct varobj *var,
 			       enum print_values print_values,
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index ca59213..9658400 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -79,7 +79,7 @@ static const char *microblaze_register_names[] =
 
 #define MICROBLAZE_NUM_REGS ARRAY_SIZE (microblaze_register_names)
 
-static int microblaze_debug_flag = 0;
+static unsigned int microblaze_debug_flag = 0;
 
 static void
 microblaze_debug (const char *fmt, ...)
@@ -739,13 +739,13 @@ _initialize_microblaze_tdep (void)
   register_gdbarch_init (bfd_arch_microblaze, microblaze_gdbarch_init);
 
   /* Debug this files internals.  */
-  add_setshow_zinteger_cmd ("microblaze", class_maintenance,
-			    &microblaze_debug_flag, _("\
+  add_setshow_zuinteger_cmd ("microblaze", class_maintenance,
+			     &microblaze_debug_flag, _("\
 Set microblaze debugging."), _("\
 Show microblaze debugging."), _("\
 When non-zero, microblaze specific debugging is enabled."),
-			    NULL,
-			    NULL, 
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     NULL,
+			     &setdebuglist, &showdebuglist);
 
 }
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 0439989..a001424 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -177,7 +177,7 @@ const struct register_alias mips_numeric_register_aliases[] = {
 static int mips_fpu_type_auto = 1;
 static enum mips_fpu_type mips_fpu_type = MIPS_DEFAULT_FPU_TYPE;
 
-static int mips_debug = 0;
+static unsigned int mips_debug = 0;
 
 /* Properties (for struct target_desc) describing the g/G packet
    layout.  */
@@ -8879,13 +8879,13 @@ that would transfer 32 bits for some registers (e.g. SR, FSR) and\n\
 			   &setlist, &showlist);
 
   /* Debug this files internals.  */
-  add_setshow_zinteger_cmd ("mips", class_maintenance,
-			    &mips_debug, _("\
+  add_setshow_zuinteger_cmd ("mips", class_maintenance,
+			     &mips_debug, _("\
 Set mips debugging."), _("\
 Show mips debugging."), _("\
 When non-zero, mips specific debugging is enabled."),
-			    NULL,
-			    NULL, /* FIXME: i18n: Mips debugging is
-				     currently %s.  */
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     NULL, /* FIXME: i18n: Mips debugging is
+				      currently %s.  */
+			     &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/monitor.c b/gdb/monitor.c
index b9f345e..d19a49c 100644
--- a/gdb/monitor.c
+++ b/gdb/monitor.c
@@ -120,7 +120,7 @@ static ptid_t monitor_ptid;
 
 static void monitor_debug (const char *fmt, ...) ATTRIBUTE_PRINTF (1, 2);
 
-static int monitor_debug_p = 0;
+static unsigned int monitor_debug_p = 0;
 
 /* NOTE: This file alternates between monitor_debug_p and remote_debug
    when determining if debug information is printed.  Perhaps this
@@ -2376,14 +2376,14 @@ When enabled, a hashmark \'#\' is displayed."),
 			   NULL, /* FIXME: i18n: */
 			   &setlist, &showlist);
 
-  add_setshow_zinteger_cmd ("monitor", no_class, &monitor_debug_p, _("\
+  add_setshow_zuinteger_cmd ("monitor", no_class, &monitor_debug_p, _("\
 Set debugging of remote monitor communication."), _("\
 Show debugging of remote monitor communication."), _("\
 When enabled, communication between GDB and the remote monitor\n\
 is displayed."),
-			    NULL,
-			    NULL, /* FIXME: i18n: */
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     NULL, /* FIXME: i18n: */
+			     &setdebuglist, &showdebuglist);
 
   /* Yes, 42000 is arbitrary.  The only sense out of it, is that it
      isn't 0.  */
diff --git a/gdb/observer.c b/gdb/observer.c
index 276ca75..2c6c22f 100644
--- a/gdb/observer.c
+++ b/gdb/observer.c
@@ -54,7 +54,7 @@
 #include "command.h"
 #include "gdbcmd.h"
 
-static int observer_debug;
+static unsigned int observer_debug;
 static void
 show_observer_debug (struct ui_file *file, int from_tty,
 		     struct cmd_list_element *c, const char *value)
@@ -209,14 +209,14 @@ extern initialize_file_ftype _initialize_observer; /* -Wmissing-prototypes */
 void
 _initialize_observer (void)
 {
-  add_setshow_zinteger_cmd ("observer", class_maintenance,
-			    &observer_debug, _("\
+  add_setshow_zuinteger_cmd ("observer", class_maintenance,
+			     &observer_debug, _("\
 Set observer debugging."), _("\
 Show observer debugging."), _("\
 When non-zero, observer debugging is enabled."),
-			    NULL,
-			    show_observer_debug,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     show_observer_debug,
+			     &setdebuglist, &showdebuglist);
 }
 
 #include "observer.inc"
diff --git a/gdb/parse.c b/gdb/parse.c
index 269d8fc..d1ed4e8 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -90,7 +90,7 @@ int in_parse_field;
    field name.  It is -1 if no dereference operation was found.  */
 static int expout_last_struct = -1;
 
-static int expressiondebug = 0;
+static unsigned int expressiondebug = 0;
 static void
 show_expressiondebug (struct ui_file *file, int from_tty,
 		      struct cmd_list_element *c, const char *value)
@@ -1859,15 +1859,15 @@ _initialize_parse (void)
   type_stack.depth = 0;
   type_stack.elements = NULL;
 
-  add_setshow_zinteger_cmd ("expression", class_maintenance,
-			    &expressiondebug,
-			    _("Set expression debugging."),
-			    _("Show expression debugging."),
-			    _("When non-zero, the internal representation "
-			      "of expressions will be printed."),
-			    NULL,
-			    show_expressiondebug,
-			    &setdebuglist, &showdebuglist);
+  add_setshow_zuinteger_cmd ("expression", class_maintenance,
+			     &expressiondebug,
+			     _("Set expression debugging."),
+			     _("Show expression debugging."),
+			     _("When non-zero, the internal representation "
+			       "of expressions will be printed."),
+			     NULL,
+			     show_expressiondebug,
+			     &setdebuglist, &showdebuglist);
   add_setshow_boolean_cmd ("parser", class_maintenance,
 			    &parser_debug,
 			   _("Set parser debugging."),
diff --git a/gdb/record.c b/gdb/record.c
index ac55cdf..5cbac00 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -153,7 +153,7 @@ struct record_entry
 };
 
 /* This is the debug switch for process record.  */
-int record_debug = 0;
+unsigned int record_debug = 0;
 
 /* If true, query if PREC cannot record memory
    change of next instruction.  */
@@ -2982,13 +2982,13 @@ _initialize_record (void)
   init_record_core_ops ();
   add_target (&record_core_ops);
 
-  add_setshow_zinteger_cmd ("record", no_class, &record_debug,
-			    _("Set debugging of record/replay feature."),
-			    _("Show debugging of record/replay feature."),
-			    _("When enabled, debugging output for "
-			      "record/replay feature is displayed."),
-			    NULL, show_record_debug, &setdebuglist,
-			    &showdebuglist);
+  add_setshow_zuinteger_cmd ("record", no_class, &record_debug,
+			     _("Set debugging of record/replay feature."),
+			     _("Show debugging of record/replay feature."),
+			     _("When enabled, debugging output for "
+			       "record/replay feature is displayed."),
+			     NULL, show_record_debug, &setdebuglist,
+			     &showdebuglist);
 
   c = add_prefix_cmd ("record", class_obscure, cmd_record_start,
 		      _("Abbreviated form of \"target record\" command."),
diff --git a/gdb/record.h b/gdb/record.h
index ee591ea..a199378 100644
--- a/gdb/record.h
+++ b/gdb/record.h
@@ -22,7 +22,7 @@
 
 #define RECORD_IS_USED	(current_target.to_stratum == record_stratum)
 
-extern int record_debug;
+extern unsigned int record_debug;
 extern int record_memory_query;
 
 extern int record_arch_list_add_reg (struct regcache *regcache, int num);
diff --git a/gdb/serial.c b/gdb/serial.c
index df18b2f..62d7fa9 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -27,7 +27,7 @@ extern void _initialize_serial (void);
 
 /* Is serial being debugged?  */
 
-static int global_serial_debug_p;
+static unsigned int global_serial_debug_p;
 
 /* Linked list of serial I/O handlers.  */
 
@@ -671,12 +671,12 @@ Show numerical base for remote session logging"), NULL,
 			NULL, /* FIXME: i18n: */
 			&setlist, &showlist);
 
-  add_setshow_zinteger_cmd ("serial", class_maintenance,
-			    &global_serial_debug_p, _("\
+  add_setshow_zuinteger_cmd ("serial", class_maintenance,
+			     &global_serial_debug_p, _("\
 Set serial debugging."), _("\
 Show serial debugging."), _("\
 When non-zero, serial port debugging is enabled."),
-			    NULL,
-			    NULL, /* FIXME: i18n: */
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     NULL, /* FIXME: i18n: */
+			     &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index fcc01a8..3005326 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -35,7 +35,7 @@
 #define GOT_MODULE_OFFSET 4
 
 /* Flag which indicates whether internal debug messages should be printed.  */
-static int solib_dsbt_debug = 0;
+static unsigned int solib_dsbt_debug = 0;
 
 /* TIC6X pointers are four bytes wide.  */
 enum { TIC6X_PTR_SIZE = 4 };
@@ -1184,12 +1184,12 @@ _initialize_dsbt_solib (void)
   dsbt_so_ops.bfd_open = solib_bfd_open;
 
   /* Debug this file's internals.  */
-  add_setshow_zinteger_cmd ("solib-dsbt", class_maintenance,
-			    &solib_dsbt_debug, _("\
+  add_setshow_zuinteger_cmd ("solib-dsbt", class_maintenance,
+			     &solib_dsbt_debug, _("\
 Set internal debugging of shared library code for DSBT ELF."), _("\
 Show internal debugging of shared library code for DSBT ELF."), _("\
 When non-zero, DSBT solib specific internal debugging is enabled."),
-			    NULL,
-			    show_dsbt_debug,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     show_dsbt_debug,
+			     &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index 0f59535..57a14a8 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -34,7 +34,7 @@
 #include "gdb_bfd.h"
 
 /* Flag which indicates whether internal debug messages should be printed.  */
-static int solib_frv_debug;
+static unsigned int solib_frv_debug;
 
 /* FR-V pointers are four bytes wide.  */
 enum { FRV_PTR_SIZE = 4 };
@@ -1184,12 +1184,12 @@ _initialize_frv_solib (void)
   frv_so_ops.bfd_open = solib_bfd_open;
 
   /* Debug this file's internals.  */
-  add_setshow_zinteger_cmd ("solib-frv", class_maintenance,
-			    &solib_frv_debug, _("\
+  add_setshow_zuinteger_cmd ("solib-frv", class_maintenance,
+			     &solib_frv_debug, _("\
 Set internal debugging of shared library code for FR-V."), _("\
 Show internal debugging of shared library code for FR-V."), _("\
 When non-zero, FR-V solib specific internal debugging is enabled."),
-			    NULL,
-			    NULL, /* FIXME: i18n: */
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     NULL, /* FIXME: i18n: */
+			     &setdebuglist, &showdebuglist);
 }
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index 91f3c30..6215b93 100644
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -53,7 +53,7 @@ static const struct probe_ops stap_probe_ops;
 /* Should we display debug information for the probe's argument expression
    parsing?  */
 
-static int stap_expression_debug = 0;
+static unsigned int stap_expression_debug = 0;
 
 /* The various possibilities of bitness defined for a probe's argument.
 
@@ -1533,15 +1533,15 @@ _initialize_stap_probe (void)
 {
   VEC_safe_push (probe_ops_cp, all_probe_ops, &stap_probe_ops);
 
-  add_setshow_zinteger_cmd ("stap-expression", class_maintenance,
-			    &stap_expression_debug,
-			    _("Set SystemTap expression debugging."),
-			    _("Show SystemTap expression debugging."),
-			    _("When non-zero, the internal representation "
-			      "of SystemTap expressions will be printed."),
-			    NULL,
-			    show_stapexpressiondebug,
-			    &setdebuglist, &showdebuglist);
+  add_setshow_zuinteger_cmd ("stap-expression", class_maintenance,
+			     &stap_expression_debug,
+			     _("Set SystemTap expression debugging."),
+			     _("Show SystemTap expression debugging."),
+			     _("When non-zero, the internal representation "
+			       "of SystemTap expressions will be printed."),
+			     NULL,
+			     show_stapexpressiondebug,
+			     &setdebuglist, &showdebuglist);
 
   create_internalvar_type_lazy ("_probe_argc", &probe_funcs,
 				(void *) (uintptr_t) -1);
diff --git a/gdb/target.c b/gdb/target.c
index ae31415..1fc8802 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -205,7 +205,7 @@ int may_stop = 1;
 
 /* Non-zero if we want to see trace of target level stuff.  */
 
-static int targetdebug = 0;
+static unsigned int targetdebug = 0;
 static void
 show_targetdebug (struct ui_file *file, int from_tty,
 		  struct cmd_list_element *c, const char *value)
@@ -4774,15 +4774,15 @@ initialize_targets (void)
   add_info ("target", target_info, targ_desc);
   add_info ("files", target_info, targ_desc);
 
-  add_setshow_zinteger_cmd ("target", class_maintenance, &targetdebug, _("\
+  add_setshow_zuinteger_cmd ("target", class_maintenance, &targetdebug, _("\
 Set target debugging."), _("\
 Show target debugging."), _("\
 When non-zero, target debugging is enabled.  Higher numbers are more\n\
 verbose.  Changes do not take effect until the next \"run\" or \"target\"\n\
 command."),
-			    NULL,
-			    show_targetdebug,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     show_targetdebug,
+			     &setdebuglist, &showdebuglist);
 
   add_setshow_boolean_cmd ("trust-readonly-sections", class_support,
 			   &trust_readonly, _("\
diff --git a/gdb/valops.c b/gdb/valops.c
index f6d8441..934f381 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -46,7 +46,7 @@
 #include "symtab.h"
 #include "exceptions.h"
 
-extern int overload_debug;
+extern unsigned int overload_debug;
 /* Local functions.  */
 
 static int typecmp (int staticp, int varargs, int nargs,
diff --git a/gdb/varobj.c b/gdb/varobj.c
index a75a40d..c345c80 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -49,7 +49,7 @@ typedef int PyObject;
 
 /* Non-zero if we want to see trace of varobj level stuff.  */
 
-int varobjdebug = 0;
+unsigned int varobjdebug = 0;
 static void
 show_varobjdebug (struct ui_file *file, int from_tty,
 		  struct cmd_list_element *c, const char *value)
@@ -4176,13 +4176,13 @@ _initialize_varobj (void)
   varobj_table = xmalloc (sizeof_table);
   memset (varobj_table, 0, sizeof_table);
 
-  add_setshow_zinteger_cmd ("debugvarobj", class_maintenance,
-			    &varobjdebug,
-			    _("Set varobj debugging."),
-			    _("Show varobj debugging."),
-			    _("When non-zero, varobj debugging is enabled."),
-			    NULL, show_varobjdebug,
-			    &setlist, &showlist);
+  add_setshow_zuinteger_cmd ("debugvarobj", class_maintenance,
+			     &varobjdebug,
+			     _("Set varobj debugging."),
+			     _("Show varobj debugging."),
+			     _("When non-zero, varobj debugging is enabled."),
+			     NULL, show_varobjdebug,
+			     &setlist, &showlist);
 }
 
 /* Invalidate varobj VAR if it is tied to locals and re-create it if it is
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index b2a0617..119dc6f 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -55,7 +55,7 @@
 #include "xtensa-config.h"
 
 
-static int xtensa_debug_level = 0;
+static unsigned int xtensa_debug_level = 0;
 
 #define DEBUGWARN(args...) \
   if (xtensa_debug_level > 0) \
@@ -3308,14 +3308,14 @@ _initialize_xtensa_tdep (void)
   gdbarch_register (bfd_arch_xtensa, xtensa_gdbarch_init, xtensa_dump_tdep);
   xtensa_init_reggroups ();
 
-  add_setshow_zinteger_cmd ("xtensa",
-			    class_maintenance,
-			    &xtensa_debug_level,
+  add_setshow_zuinteger_cmd ("xtensa",
+			     class_maintenance,
+			     &xtensa_debug_level,
 			    _("Set Xtensa debugging."),
 			    _("Show Xtensa debugging."), _("\
 When non-zero, Xtensa-specific debugging is enabled. \
 Can be 1, 2, 3, or 4 indicating the level of debugging."),
-			    NULL,
-			    NULL,
-			    &setdebuglist, &showdebuglist);
+			     NULL,
+			     NULL,
+			     &setdebuglist, &showdebuglist);
 }