diff options
| author | Tom Tromey <tom@tromey.com> | 2022-06-19 14:59:32 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2022-08-19 08:23:20 -0600 |
| commit | 37163dcf1a1b32115a49a51410e352366cc02fbc (patch) | |
| tree | 1dc2314d4c10b1a77d90431786f45f01c7ab5a0a | |
| parent | d7c83303890edf9b59a93fb0ed4942f80b734af7 (diff) | |
| download | gdb-37163dcf1a1b32115a49a51410e352366cc02fbc.zip gdb-37163dcf1a1b32115a49a51410e352366cc02fbc.tar.gz gdb-37163dcf1a1b32115a49a51410e352366cc02fbc.tar.bz2 | |
Remove two initialization functions
I noticed a couple of initialization functions that aren't really
needed, and that currently require explicit calls in gdb_init. This
patch removes these functions, simplifying gdb a little.
Regression tested on x86-64 Fedora 34.
| -rw-r--r-- | gdb/cli/cli-cmds.c | 8 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.h | 2 | ||||
| -rw-r--r-- | gdb/top.c | 23 |
3 files changed, 8 insertions, 25 deletions
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 18fb6e6..d570719 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -76,7 +76,7 @@ static void filter_sals (std::vector<symtab_and_line> &); /* See cli-cmds.h. */ -unsigned int max_user_call_depth; +unsigned int max_user_call_depth = 1024; /* Define all cmd_list_elements. */ @@ -2105,12 +2105,6 @@ filter_sals (std::vector<symtab_and_line> &sals) sals.erase (from, sals.end ()); } -void -init_cmd_lists (void) -{ - max_user_call_depth = 1024; -} - static void show_info_verbose (struct ui_file *file, int from_tty, struct cmd_list_element *c, diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h index 770abec..89ad0d1 100644 --- a/gdb/cli/cli-cmds.h +++ b/gdb/cli/cli-cmds.h @@ -151,8 +151,6 @@ extern unsigned int max_user_call_depth; /* Exported to gdb/top.c */ -void init_cmd_lists (void); - int is_complete_command (struct cmd_list_element *cmd); /* Exported to gdb/main.c */ @@ -2232,17 +2232,6 @@ show_startup_quiet (struct ui_file *file, int from_tty, } static void -init_gdb_version_vars (void) -{ - struct internalvar *major_version_var = create_internalvar ("_gdb_major"); - struct internalvar *minor_version_var = create_internalvar ("_gdb_minor"); - int vmajor = 0, vminor = 0, vrevision = 0; - sscanf (version, "%d.%d.%d", &vmajor, &vminor, &vrevision); - set_internalvar_integer (major_version_var, vmajor); - set_internalvar_integer (minor_version_var, vminor + (vrevision > 0)); -} - -static void init_main (void) { struct cmd_list_element *c; @@ -2405,6 +2394,13 @@ Usage: new-ui INTERPRETER TTY\n\ The first argument is the name of the interpreter to run.\n\ The second argument is the terminal the UI runs on."), &cmdlist); set_cmd_completer (c, interpreter_completer); + + struct internalvar *major_version_var = create_internalvar ("_gdb_major"); + struct internalvar *minor_version_var = create_internalvar ("_gdb_minor"); + int vmajor = 0, vminor = 0, vrevision = 0; + sscanf (version, "%d.%d.%d", &vmajor, &vminor, &vrevision); + set_internalvar_integer (major_version_var, vmajor); + set_internalvar_integer (minor_version_var, vminor + (vrevision > 0)); } /* See top.h. */ @@ -2423,8 +2419,6 @@ gdb_init () make_final_cleanup (do_chdir_cleanup, xstrdup (current_directory)); #endif - init_cmd_lists (); /* This needs to be done first. */ - init_page_info (); /* Here is where we call all the _initialize_foo routines. */ @@ -2454,9 +2448,6 @@ gdb_init () during startup. */ set_language (language_c); expected_language = current_language; /* Don't warn about the change. */ - - /* Create $_gdb_major and $_gdb_minor convenience variables. */ - init_gdb_version_vars (); } void _initialize_top (); |