From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 671EB3858432 for ; Mon, 1 Nov 2021 15:50:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 671EB3858432 X-ASG-Debug-ID: 1635781810-0c856e03878b84d0001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id cJJH91aRYRQrm6Ak (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 01 Nov 2021 11:50:11 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@efficios.com X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from smarchi-efficios.internal.efficios.com (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtp.ebox.ca (Postfix) with ESMTP id E2320441D65; Mon, 1 Nov 2021 11:50:10 -0400 (EDT) From: Simon Marchi X-Barracuda-RBL-IP: 192.222.180.24 X-Barracuda-Effective-Source-IP: 192-222-180-24.qc.cable.ebox.net[192.222.180.24] X-Barracuda-Apparent-Source-IP: 192.222.180.24 To: gdb-patches@sourceware.org Subject: [PATCH 2/5] gdb: remove unnecessary cmd_list_element::aliases nullptr checks Date: Mon, 1 Nov 2021 11:50:06 -0400 X-ASG-Orig-Subj: [PATCH 2/5] gdb: remove unnecessary cmd_list_element::aliases nullptr checks Message-Id: <20211101155009.457224-3-simon.marchi@efficios.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211101155009.457224-1-simon.marchi@efficios.com> References: <20211101155009.457224-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1635781811 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 1815 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.93667 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_SOFTFAIL, 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: Mon, 01 Nov 2021 15:50:20 -0000 From: Simon Marchi Remove two unnecessary nullptr checks. If aliases is nullptr, then the for loops will simply be skipped. Change-Id: I9132063bb17798391f8d019af305383fa8e0229f --- gdb/cli/cli-decode.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 396aefb4b011..de90198dfa71 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -1351,16 +1351,11 @@ static void fput_aliases_definition_styled (struct cmd_list_element *cmd, struct ui_file *stream) { - if (cmd->aliases != nullptr) - { - for (cmd_list_element *iter = cmd->aliases; - iter; - iter = iter->alias_chain) - { - if (!iter->default_args.empty ()) - fput_alias_definition_styled (iter, stream); - } - } + for (cmd_list_element *iter = cmd->aliases; + iter != nullptr; + iter = iter->alias_chain) + if (!iter->default_args.empty ()) + fput_alias_definition_styled (iter, stream); } @@ -1377,15 +1372,14 @@ fput_command_names_styled (struct cmd_list_element *c, { if (always_fput_c_name || c->aliases != nullptr) fput_command_name_styled (c, stream); - if (c->aliases != nullptr) + + for (cmd_list_element *iter = c->aliases; iter; iter = iter->alias_chain) { - for (cmd_list_element *iter = c->aliases; iter; iter = iter->alias_chain) - { - fputs_filtered (", ", stream); - wrap_here (" "); - fput_command_name_styled (iter, stream); - } + fputs_filtered (", ", stream); + wrap_here (" "); + fput_command_name_styled (iter, stream); } + if (always_fput_c_name || c->aliases != nullptr) fputs_filtered (postfix, stream); } -- 2.26.2