Remove initialize_utils

initialize_utils only registers some commands, so it isn't necessary
to run it at any particular time during startup.  This patch removes
it and merges its contents into _initialize_utils.

Tested by the buildbot.

gdb/ChangeLog
2019-09-26  Tom Tromey  <tom@tromey.com>

	* utils.h (initialize_utils): Don't declare.
	* top.c (gdb_init): Don't call initialize_utils.
	* utils.c (initialize_utils): Remove.  Move contents...
	(_initialize_utils): ... here.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 81f5785a78f9dd7e791a58af0a094f6f0a03a7bd..bc6c20375b7f2f6ff7cf63bf2ecfd675bff226a8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-26  Tom Tromey  <tom@tromey.com>
+
+       * utils.h (initialize_utils): Don't declare.
+       * top.c (gdb_init): Don't call initialize_utils.
+       * utils.c (initialize_utils): Remove.  Move contents...
+       (_initialize_utils): ... here.
+
 2019-09-25  Tom Tromey  <tom@tromey.com>
 
        * python/py-objfile.c (objfpy_get_build_id): Use bin2hex.

diff --git a/gdb/top.c b/gdb/top.c
index 49e6daae94972ecef3094b400a004363543156de..a1a08e0b99ec1b9e3a6d717a47165dd95e6b1ce0 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -2234,7 +2234,6 @@ gdb_init (char *argv0)
 
   init_cmd_lists ();       /* This needs to be done first.  */
   initialize_targets ();    /* Setup target_terminal macros for utils.c.  */
-  initialize_utils ();     /* Make errors and warnings possible.  */
 
   init_page_info ();
 

diff --git a/gdb/utils.c b/gdb/utils.c
index 154fcd97e2a8f730592e1ee7aae94000a01ef20d..11295ed97895cdb142423109ea56c33a37154344 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -2773,57 +2773,6 @@ show_debug_timestamp (struct ui_file *file, int from_tty,
 }
 \f
 
-void
-initialize_utils (void)
-{
-  add_setshow_uinteger_cmd ("width", class_support, &chars_per_line, _("\
-Set number of characters where GDB should wrap lines of its output."), _("\
-Show number of characters where GDB should wrap lines of its output."), _("\
-This affects where GDB wraps its output to fit the screen width.\n\
-Setting this to \"unlimited\" or zero prevents GDB from wrapping its output."),
-                           set_width_command,
-                           show_chars_per_line,
-                           &setlist, &showlist);
-
-  add_setshow_uinteger_cmd ("height", class_support, &lines_per_page, _("\
-Set number of lines in a page for GDB output pagination."), _("\
-Show number of lines in a page for GDB output pagination."), _("\
-This affects the number of lines after which GDB will pause\n\
-its output and ask you whether to continue.\n\
-Setting this to \"unlimited\" or zero causes GDB never pause during output."),
-                           set_height_command,
-                           show_lines_per_page,
-                           &setlist, &showlist);
-
-  add_setshow_boolean_cmd ("pagination", class_support,
-                          &pagination_enabled, _("\
-Set state of GDB output pagination."), _("\
-Show state of GDB output pagination."), _("\
-When pagination is ON, GDB pauses at end of each screenful of\n\
-its output and asks you whether to continue.\n\
-Turning pagination off is an alternative to \"set height unlimited\"."),
-                          NULL,
-                          show_pagination_enabled,
-                          &setlist, &showlist);
-
-  add_setshow_boolean_cmd ("sevenbit-strings", class_support,
-                          &sevenbit_strings, _("\
-Set printing of 8-bit characters in strings as \\nnn."), _("\
-Show printing of 8-bit characters in strings as \\nnn."), NULL,
-                          NULL,
-                          show_sevenbit_strings,
-                          &setprintlist, &showprintlist);
-
-  add_setshow_boolean_cmd ("timestamp", class_maintenance,
-                           &debug_timestamp, _("\
-Set timestamping of debugging messages."), _("\
-Show timestamping of debugging messages."), _("\
-When set, debugging messages will be marked with seconds and microseconds."),
-                          NULL,
-                          show_debug_timestamp,
-                          &setdebuglist, &showdebuglist);
-}
-
 /* See utils.h.  */
 
 CORE_ADDR
@@ -3432,6 +3381,53 @@ copy_bitwise (gdb_byte *dest, ULONGEST dest_offset,
 void
 _initialize_utils (void)
 {
+  add_setshow_uinteger_cmd ("width", class_support, &chars_per_line, _("\
+Set number of characters where GDB should wrap lines of its output."), _("\
+Show number of characters where GDB should wrap lines of its output."), _("\
+This affects where GDB wraps its output to fit the screen width.\n\
+Setting this to \"unlimited\" or zero prevents GDB from wrapping its output."),
+                           set_width_command,
+                           show_chars_per_line,
+                           &setlist, &showlist);
+
+  add_setshow_uinteger_cmd ("height", class_support, &lines_per_page, _("\
+Set number of lines in a page for GDB output pagination."), _("\
+Show number of lines in a page for GDB output pagination."), _("\
+This affects the number of lines after which GDB will pause\n\
+its output and ask you whether to continue.\n\
+Setting this to \"unlimited\" or zero causes GDB never pause during output."),
+                           set_height_command,
+                           show_lines_per_page,
+                           &setlist, &showlist);
+
+  add_setshow_boolean_cmd ("pagination", class_support,
+                          &pagination_enabled, _("\
+Set state of GDB output pagination."), _("\
+Show state of GDB output pagination."), _("\
+When pagination is ON, GDB pauses at end of each screenful of\n\
+its output and asks you whether to continue.\n\
+Turning pagination off is an alternative to \"set height unlimited\"."),
+                          NULL,
+                          show_pagination_enabled,
+                          &setlist, &showlist);
+
+  add_setshow_boolean_cmd ("sevenbit-strings", class_support,
+                          &sevenbit_strings, _("\
+Set printing of 8-bit characters in strings as \\nnn."), _("\
+Show printing of 8-bit characters in strings as \\nnn."), NULL,
+                          NULL,
+                          show_sevenbit_strings,
+                          &setprintlist, &showprintlist);
+
+  add_setshow_boolean_cmd ("timestamp", class_maintenance,
+                           &debug_timestamp, _("\
+Set timestamping of debugging messages."), _("\
+Show timestamping of debugging messages."), _("\
+When set, debugging messages will be marked with seconds and microseconds."),
+                          NULL,
+                          show_debug_timestamp,
+                          &setdebuglist, &showdebuglist);
+
   add_internal_problem_command (&internal_error_problem);
   add_internal_problem_command (&internal_warning_problem);
   add_internal_problem_command (&demangler_warning_problem);

diff --git a/gdb/utils.h b/gdb/utils.h
index b0b5573239eec191424d340f860be01526e6528a..7df86beec4714edd2ce54be49fdf4796f74df303 100644 (file)
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -28,8 +28,6 @@
 struct completion_match_for_lcd;
 class compiled_regex;
 
-extern void initialize_utils (void);
-
 /* String utilities.  */
 
 extern bool sevenbit_strings;