From patchwork Sun Dec 31 20:25:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 83059 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CC6C23858296 for ; Sun, 31 Dec 2023 20:26:16 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 42BF03858C35 for ; Sun, 31 Dec 2023 20:25:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 42BF03858C35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 42BF03858C35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704054343; cv=none; b=KC1OyyhfeCVVPpzHyDzFuMz3ICT6O2DNGjziiqmNf/xFtdJj4pUSEXk9PV078fxBbEGAjR2LesiKvo4H7LwTouLFkfMqS3OPBGyVdhuORdml+B/u4eaiAn46+6v3rLgxWz03vbk+dZ5MqXCEDbt6FDq3GKlk/p6G78W/exJ4mHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704054343; c=relaxed/simple; bh=SNNlYiDcPPO46LzpWsmhHbYPvOxWrv+Wk6+bx5O760A=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=lTzxGYstsKq4S2M1z6zZuciFDSXAGi9eC4LrO12YzkId6HmWUCr0gFK/FrHI6wbdI79CvplExD2ola+eQT7sxyrYxh6drRMo9eFaMz77mq28+toSXyv19gSW5v93Jv4pJeDGQ1UtXzLFJKpzym98EvlpJg0RGukEpUxv0xzOSgo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5006a.ext.cloudfilter.net ([10.0.29.179]) by cmsmtp with ESMTPS id K1yerz6T96nOZK2NRrYGBU; Sun, 31 Dec 2023 20:25:41 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id K2NQrrK5k1J28K2NQrMR6D; Sun, 31 Dec 2023 20:25:40 +0000 X-Authority-Analysis: v=2.4 cv=Tqz1ORbh c=1 sm=1 tr=0 ts=6591ce44 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=e2cXIFwxEfEA:10 a=Qbun_eYptAEA:10 a=58UD4nXCBVqX37PKTwcA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=JxCvWAMFPZg5WFhZMeYM9NSfPdbOr5t4sPP/lK0UVNM=; b=FVTQJtMROQ6n1gGfRTv+ORga1Y GluOYdQBXZpPOfxn2/PTLi/JXfMH1h4ii0lGZF2iJxV425XBzt89tlZsiVbcFjnALi81B9DxIbU4o CPZrJ8YHGpDgaHFYr+x5bOKPC; Received: from 71-211-161-25.hlrn.qwest.net ([71.211.161.25]:45228 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rK2NP-002PSB-2s for gdb-patches@sourceware.org; Sun, 31 Dec 2023 13:25:39 -0700 From: Tom Tromey Date: Sun, 31 Dec 2023 13:25:41 -0700 Subject: [PATCH 4/6] Remove sentinel from remote_fio_func_map MIME-Version: 1.0 Message-Id: <20231231-remote-fileio-v1-4-249cc6c440d9@tromey.com> References: <20231231-remote-fileio-v1-0-249cc6c440d9@tromey.com> In-Reply-To: <20231231-remote-fileio-v1-0-249cc6c440d9@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.161.25 X-Source-L: No X-Exim-ID: 1rK2NP-002PSB-2s X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-161-25.hlrn.qwest.net ([192.168.0.21]) [71.211.161.25]:45228 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfIuBotcJUCTiHgfco6nOGggcY3rHSTAaoMKK44DJbQBm1y6nAKRMx+KsWyovkuLqEztNedqJWjMkadYqhrVMx2rGt0LcvGGyuzdOZM4r9QuM4if6Me8z jwC/H66I6rnEGaQbfh6q4XX6KrgyIIuiLgzXfNh0EkvKTN8vrPZ9YcaGxKhn8oOYvsNH0+qbGMLwvl2iKCuIg0zRdbfpJroGuYI= X-Spam-Status: No, score=-3022.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org With foreach, a static array like remote_fio_func_map does not need a sentinel entry. This patch removes it and slightly rearranges the code to suit. --- gdb/remote-fileio.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c index f6990989da6..e001c220522 100644 --- a/gdb/remote-fileio.c +++ b/gdb/remote-fileio.c @@ -1154,11 +1154,9 @@ remote_fileio_data::do_request (remote_target *remote, char *buf) { "gettimeofday", &remote_fileio_data::func_gettimeofday }, { "isatty", &remote_fileio_data::func_isatty }, { "system", &remote_fileio_data::func_system }, - { nullptr, nullptr } }; char *c; - int idx; quit_handler = remote_fileio_quit_handler; @@ -1167,13 +1165,14 @@ remote_fileio_data::do_request (remote_target *remote, char *buf) *c++ = '\0'; else c = strchr (buf, '\0'); - for (idx = 0; remote_fio_func_map[idx].name; ++idx) - if (!strcmp (remote_fio_func_map[idx].name, buf)) - break; - if (!remote_fio_func_map[idx].name) - remote_fileio_reply (remote, -1, FILEIO_ENOSYS); - else - (this->*remote_fio_func_map[idx].func) (remote, c); + for (const auto &entry : remote_fio_func_map) + if (!strcmp (entry.name, buf)) + { + (this->*entry.func) (remote, c); + return; + } + + remote_fileio_reply (remote, -1, FILEIO_ENOSYS); } /* Close any open descriptors, and reinitialize the file mapping. */