From patchwork Sat Jan 25 05:08:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 37539 Received: (qmail 41758 invoked by alias); 25 Jan 2020 05:08:33 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 41747 invoked by uid 89); 25 Jan 2020 05:08:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-pg1-f202.google.com Received: from mail-pg1-f202.google.com (HELO mail-pg1-f202.google.com) (209.85.215.202) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 25 Jan 2020 05:08:32 +0000 Received: by mail-pg1-f202.google.com with SMTP id v30so2638612pga.22 for ; Fri, 24 Jan 2020 21:08:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=0CeT+YVQmF5dFVUik5+61ih4Sz62s1ZtlBIub3lJj4U=; b=rDHztlnZpMSR87nRGV4E+QK2r20GBHzShTZpk3yet0l654/9ZNXTMRDRJZuGAdLpHY GxF4kbFBJ/GvjS8ES58S6qSgNBKk0jdrO+XzVeGYdtRPhkYrmx5YVKYnlakznC6zw33M SgFWWdaESYOis/Bd44Oltxwa0ebllnqhxXBzSCAlo6Xa0/beeZpui7KHB1jlC3IhyGfO 4Wd2XFh3aBkRgoLQ3ZMQypF80n3QM8Uv8diUH26hAEjfK6uP41zB3ZgevC9j24SgUdAb OJr34sQS48EyxFO27dlqai0kTjCcY2oYqzCKeNePSMPf97egJqCEtTTgypOohqyVSaeQ LSoQ== Date: Fri, 24 Jan 2020 21:08:25 -0800 Message-Id: <20200125050825.53004-1-tamur@google.com> Mime-Version: 1.0 Subject: [PATCH] Disambiguate info_print_options X-Patchwork-Original-From: "Ali Tamur via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Ali Tamur To: gdb-patches@sourceware.org Cc: Ali Tamur X-IsSubscribed: yes struct info_print_options is defined in both symtab.c and stack.c, which is an ODR violation. So, I am renaming one of them. (Please suggest a better name, what I picked is not good). gdb/ChangeLog: * symtab.c (info_print_options): Rename to info_print_options_for_symtab. (info_print_options_defs): Apply name change. (make_info_print_options_def_group): Likewise. (info_variables_command): Likewise. (info_functions_command): Likewise. --- gdb/symtab.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index f456f4d852..95c15ac6e0 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_print_options_for_symtab { bool quiet = false; bool exclude_minsyms = false; char *type_regexp = nullptr; - ~info_print_options () + ~info_print_options_for_symtab () { xfree (type_regexp); } @@ -4992,23 +4992,23 @@ struct info_print_options commands. */ static const gdb::option::option_def info_print_options_defs[] = { - gdb::option::boolean_option_def { + gdb::option::boolean_option_def { "q", - [] (info_print_options *opt) { return &opt->quiet; }, + [] (info_print_options_for_symtab *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_print_options_for_symtab *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_print_options_for_symtab *opt) { return &opt->type_regexp; }, nullptr, /* show_cmd_cb */ nullptr /* set_doc */ } @@ -5018,7 +5018,7 @@ 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_print_options_def_group (info_print_options_for_symtab *opts) { return {{info_print_options_defs}, opts}; } @@ -5045,7 +5045,7 @@ info_print_command_completer (struct cmd_list_element *ignore, static void info_variables_command (const char *args, int from_tty) { - info_print_options opts; + info_print_options_for_symtab opts; auto grp = make_info_print_options_def_group (&opts); gdb::option::process_options (&args, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, grp); @@ -5061,7 +5061,7 @@ info_variables_command (const char *args, int from_tty) static void info_functions_command (const char *args, int from_tty) { - info_print_options opts; + info_print_options_for_symtab opts; auto grp = make_info_print_options_def_group (&opts); gdb::option::process_options (&args, gdb::option::PROCESS_OPTIONS_UNKNOWN_IS_OPERAND, grp);