From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 67337 invoked by alias); 1 Feb 2020 23:22:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 67329 invoked by uid 89); 1 Feb 2020 23:22:16 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-33.1 required=5.0 tests=AWL,BAYES_00,ENV_AND_HDR_SPF_MATCH,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_PASS,USER_IN_DEF_SPF_WL autolearn=ham version=3.3.1 spammy=Tamur, U*tamur, stackc, UD:stack.c X-HELO: mail-wm1-f67.google.com Received: from mail-wm1-f67.google.com (HELO mail-wm1-f67.google.com) (209.85.128.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 01 Feb 2020 23:22:14 +0000 Received: by mail-wm1-f67.google.com with SMTP id c84so12785644wme.4 for ; Sat, 01 Feb 2020 15:22:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7ZNPwJFqrmViKjAKXfyl+4mXg6YXn8uYcmAY4KLAaSc=; b=GMB7FwyNK7QtgUd8aWGItWdYEyB0DR9EzhwDtBez6YcAmKKW3kzfqEBogx2/uVgDdA Ln2VEbq4X0yEa5+lvZVnOgcWPTnGWTeTyvCrptCiqgPwAN3vnSE8+ScbiIe4wQgVAH3e 044+D2v8UsWXcqoWDEw2hbkES9mLtcslWXoH/IF4ekzYw2wqY3TmHVgWigQzxLcuRPpq ltt7E1PO1m0IThxWO/rTH6suWZU5l6ud8zg3PdY/vdg7uHxkvI6XFK4Is8wbcsv5vlTw 1ZWxN7rt8xr91F+ld1PapBoPI+6TqfhdF4bJ1E5/bO1hpPHjQRJMh+3m8qjnoduubUna jKBg== MIME-Version: 1.0 References: <87a76a6vwn.fsf@tromey.com> <20200128031206.108562-1-tamur@google.com> In-Reply-To: <20200128031206.108562-1-tamur@google.com> From: "Ali Tamur via gdb-patches" Reply-To: Ali Tamur Date: Sat, 01 Feb 2020 23:22:00 -0000 Message-ID: Subject: Re: [PATCH] Disambiguate info_print_options To: gdb-patches Cc: Tom Tromey Content-Type: text/plain; charset="UTF-8" X-IsSubscribed: yes X-SW-Source: 2020-02/txt/msg00028.txt.bz2 Friendly ping? On Mon, Jan 27, 2020 at 7:12 PM Ali Tamur wrote: > > So how about "info_vars_funcs_options"? > > > > Maybe make_info_sources_options_def_group should be renamed as well. > > And perhaps info_print_command_completer. My thinking here is that it > > is best if the related names are all consistent. > > Renamed info_print_options, info_print_options_defs, > make_info_print_options_def_group, info_print_command_completer. > Did not rename make_info_sources_options_def_group; it seems not > directly related? > > Please take another look, thank you. > > --- > struct info_print_options is defined in both symtab.c and stack.c, which is > an ODR violation. So, I am renaming info_print_options and related > structs/functions in symtab.c: > > info_print_options ==> info_vars_funcs_options > info_print_options_defs ==> info_vars_funcs_options_defs > make_info_print_options_def_group ==> > make_info_vars_funcs_options_def_group > info_print_command_completer ==> info_vars_funcs_command_completer > > gdb/ChangeLog: > > * symtab.c (info_print_options): Rename to > info_vars_funcs_options. > (info_print_options_defs): Rename to > info_vars_funcs_options_defs. > (make_info_print_options_def_group): Rename to > make_info_vars_funcs_options_def_group. > (info_print_command_completer): Rename to > info_vars_funcs_command_completer. > (info_variables_command): Apply name changes. > (info_functions_command): Likewise. > (_initialize_symtab): Likewise. > --- > gdb/symtab.c | 46 ++++++++++++++++++++++++---------------------- > 1 file changed, 24 insertions(+), 22 deletions(-) > > diff --git a/gdb/symtab.c b/gdb/symtab.c > index f456f4d852..d99be41261 100644 > --- a/gdb/symtab.c > +++ b/gdb/symtab.c > @@ -4976,13 +4976,13 @@ symtab_symbol_info (bool quiet, bool > exclude_minsyms, > and 'info functions' commands. These correspond to the -q, -t, and -n > options. */ > > -struct info_print_options > +struct info_vars_funcs_options > { > bool quiet = false; > bool exclude_minsyms = false; > char *type_regexp = nullptr; > > - ~info_print_options () > + ~info_vars_funcs_options () > { > xfree (type_regexp); > } > @@ -4991,24 +4991,25 @@ struct info_print_options > /* The options used by the 'info variables' and 'info functions' > commands. */ > > -static const gdb::option::option_def info_print_options_defs[] = { > - gdb::option::boolean_option_def { > +static const gdb::option::option_def info_vars_funcs_options_defs[] = { > + gdb::option::boolean_option_def { > "q", > - [] (info_print_options *opt) { return &opt->quiet; }, > + [] (info_vars_funcs_options *opt) { return &opt->quiet; }, > nullptr, /* show_cmd_cb */ > nullptr /* set_doc */ > }, > > - gdb::option::boolean_option_def { > + gdb::option::boolean_option_def { > "n", > - [] (info_print_options *opt) { return &opt->exclude_minsyms; }, > + [] (info_vars_funcs_options *opt) { return &opt->exclude_minsyms; }, > nullptr, /* show_cmd_cb */ > nullptr /* set_doc */ > }, > > - gdb::option::string_option_def { > + gdb::option::string_option_def { > "t", > - [] (info_print_options *opt) { return &opt->type_regexp; }, > + [] (info_vars_funcs_options *opt) { return &opt->type_regexp; > + }, > nullptr, /* show_cmd_cb */ > nullptr /* set_doc */ > } > @@ -5018,20 +5019,20 @@ static const gdb::option::option_def > info_print_options_defs[] = { > functions'. */ > > static gdb::option::option_def_group > -make_info_print_options_def_group (info_print_options *opts) > +make_info_vars_funcs_options_def_group (info_vars_funcs_options *opts) > { > - return {{info_print_options_defs}, opts}; > + return {{info_vars_funcs_options_defs}, opts}; > } > > /* Command completer for 'info variables' and 'info functions'. */ > > static void > -info_print_command_completer (struct cmd_list_element *ignore, > - completion_tracker &tracker, > - const char *text, const char * /* word */) > +info_vars_funcs_command_completer (struct cmd_list_element *ignore, > + completion_tracker &tracker, > + const char *text, const char * /* word > */) > { > const auto group > - = make_info_print_options_def_group (nullptr); > + = make_info_vars_funcs_options_def_group (nullptr); > if (gdb::option::complete_options > (tracker, &text, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, > group)) > return; > @@ -5045,8 +5046,8 @@ info_print_command_completer (struct > cmd_list_element *ignore, > static void > info_variables_command (const char *args, int from_tty) > { > - info_print_options opts; > - auto grp = make_info_print_options_def_group (&opts); > + info_vars_funcs_options opts; > + auto grp = make_info_vars_funcs_options_def_group (&opts); > gdb::option::process_options > (&args, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, grp); > if (args != nullptr && *args == '\0') > @@ -5061,8 +5062,9 @@ info_variables_command (const char *args, int > from_tty) > static void > info_functions_command (const char *args, int from_tty) > { > - info_print_options opts; > - auto grp = make_info_print_options_def_group (&opts); > + info_vars_funcs_options opts; > + > + auto grp = make_info_vars_funcs_options_def_group (&opts); > gdb::option::process_options > (&args, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, grp); > if (args != nullptr && *args == '\0') > @@ -6709,7 +6711,7 @@ Usage: info variables [-q] [-n] [-t TYPEREGEXP] > [NAMEREGEXP]\n\ > Prints the global and static variables.\n"), > _("global and static variables"), > true)); > - set_cmd_completer_handle_brkchars (c, info_print_command_completer); > + set_cmd_completer_handle_brkchars (c, > info_vars_funcs_command_completer); > if (dbx_commands) > { > c = add_com ("whereis", class_info, info_variables_command, > @@ -6719,7 +6721,7 @@ Usage: whereis [-q] [-n] [-t TYPEREGEXP] > [NAMEREGEXP]\n\ > Prints the global and static variables.\n"), > _("global and static variables"), > true)); > - set_cmd_completer_handle_brkchars (c, info_print_command_completer); > + set_cmd_completer_handle_brkchars (c, > info_vars_funcs_command_completer); > } > > c = add_info ("functions", info_functions_command, > @@ -6729,7 +6731,7 @@ Usage: info functions [-q] [-n] [-t TYPEREGEXP] > [NAMEREGEXP]\n\ > Prints the functions.\n"), > _("functions"), > true)); > - set_cmd_completer_handle_brkchars (c, info_print_command_completer); > + set_cmd_completer_handle_brkchars (c, > info_vars_funcs_command_completer); > > c = add_info ("types", info_types_command, _("\ > All type names, or those matching REGEXP.\n\ > -- > 2.25.0.341.g760bfbb309-goog > >