From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by sourceware.org (Postfix) with ESMTPS id 450DD3857C66 for ; Wed, 1 Dec 2021 15:09:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 450DD3857C66 X-IronPort-AV: E=McAfee;i="6200,9189,10184"; a="322721532" X-IronPort-AV: E=Sophos;i="5.87,278,1631602800"; d="scan'208";a="322721532" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2021 07:09:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,278,1631602800"; d="scan'208";a="512740184" Received: from ultl2604.iul.intel.com ([172.28.49.61]) by orsmga008.jf.intel.com with ESMTP; 01 Dec 2021 07:08:59 -0800 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 1/3] gdb/cli: convert cli_suppress_notification from int to bool Date: Wed, 1 Dec 2021 16:08:27 +0100 Message-Id: X-Mailer: git-send-email 2.33.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2021 15:09:44 -0000 Convert the suppress_notification flag for the CLI from int to bool. --- gdb/cli/cli-decode.c | 10 +++++----- gdb/cli/cli-decode.h | 2 +- gdb/cli/cli-interp.c | 5 +---- gdb/command.h | 8 ++++---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 030cba44338..ebe6b924bf8 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -239,7 +239,7 @@ struct cmd_list_element * add_cmd_suppress_notification (const char *name, enum command_class theclass, cmd_simple_func_ftype *fun, const char *doc, struct cmd_list_element **list, - int *suppress_notification) + bool *suppress_notification) { struct cmd_list_element *element; @@ -438,7 +438,7 @@ add_prefix_cmd_suppress_notification cmd_simple_func_ftype *fun, const char *doc, struct cmd_list_element **subcommands, int allow_unknown, struct cmd_list_element **list, - int *suppress_notification) + bool *suppress_notification) { struct cmd_list_element *element = add_prefix_cmd (name, theclass, fun, doc, subcommands, @@ -1312,7 +1312,7 @@ add_com_alias (const char *name, cmd_list_element *target, struct cmd_list_element * add_com_suppress_notification (const char *name, enum command_class theclass, cmd_simple_func_ftype *fun, const char *doc, - int *suppress_notification) + bool *suppress_notification) { return add_cmd_suppress_notification (name, theclass, fun, doc, &cmdlist, suppress_notification); @@ -2467,10 +2467,10 @@ cmd_func (struct cmd_list_element *cmd, const char *args, int from_tty) { if (!cmd->is_command_class_help ()) { - gdb::optional> restore_suppress; + gdb::optional> restore_suppress; if (cmd->suppress_notification != NULL) - restore_suppress.emplace (cmd->suppress_notification, 1); + restore_suppress.emplace (cmd->suppress_notification, true); cmd->func (args, from_tty, cmd); } diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h index f7945ba2bf5..eee24bf8677 100644 --- a/gdb/cli/cli-decode.h +++ b/gdb/cli/cli-decode.h @@ -256,7 +256,7 @@ struct cmd_list_element cli_suppress_notification', which will be set to true in cmd_func when this command is being executed. It will be set back to false when the command has been executed. */ - int *suppress_notification = nullptr; + bool *suppress_notification = nullptr; private: /* Local state (context) for this command. This can be anything. */ diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 47d1eff0547..db5e313d36e 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -68,10 +68,7 @@ cli_interp::~cli_interp () } /* Suppress notification struct. */ -struct cli_suppress_notification cli_suppress_notification = - { - 0 /* user_selected_context_changed */ - }; +struct cli_suppress_notification cli_suppress_notification; /* Returns the INTERP's data cast as cli_interp if INTERP is a CLI, and returns NULL otherwise. */ diff --git a/gdb/command.h b/gdb/command.h index bcd3882f811..6ae57dcc030 100644 --- a/gdb/command.h +++ b/gdb/command.h @@ -378,7 +378,7 @@ typedef void cmd_simple_func_ftype (const char *args, int from_tty); struct cli_suppress_notification { /* Inferior, thread, frame selected notification suppressed? */ - int user_selected_context; + bool user_selected_context = false; }; extern struct cli_suppress_notification cli_suppress_notification; @@ -421,7 +421,7 @@ extern struct cmd_list_element *add_cmd_suppress_notification (const char *name, enum command_class theclass, cmd_simple_func_ftype *fun, const char *doc, struct cmd_list_element **list, - int *suppress_notification); + bool *suppress_notification); extern struct cmd_list_element *add_alias_cmd (const char *, cmd_list_element *, @@ -467,7 +467,7 @@ extern struct cmd_list_element *add_prefix_cmd_suppress_notification const char *doc, struct cmd_list_element **subcommands, int allow_unknown, struct cmd_list_element **list, - int *suppress_notification); + bool *suppress_notification); extern struct cmd_list_element *add_abbrev_prefix_cmd (const char *, enum command_class, @@ -615,7 +615,7 @@ extern cmd_list_element *add_com_alias (const char *name, extern struct cmd_list_element *add_com_suppress_notification (const char *name, enum command_class theclass, cmd_simple_func_ftype *fun, const char *doc, - int *supress_notification); + bool *supress_notification); extern struct cmd_list_element *add_info (const char *, cmd_simple_func_ftype *fun, -- 2.33.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928