From patchwork Sun Feb 24 16:51:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 31583 Received: (qmail 114987 invoked by alias); 24 Feb 2019 16:52:08 -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 114546 invoked by uid 89); 24 Feb 2019 16:52:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Functions, communications, 125, 7, 1257 X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.56) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 24 Feb 2019 16:52:01 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 13A6B7A364 for ; Sun, 24 Feb 2019 10:52:00 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id xx0SgpfTN2qH7xx0SgLVrR; Sun, 24 Feb 2019 10:52:00 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=sbHy0ELRHfexHcqJ8/bTUpO6LSQ+6SOmY7VFTKdLfCI=; b=NDnDx0rHgsFQ7V/jGXnayNRybK FibqrxdFgOqTzNm6c7fruQrt/mjaYSolXdHnoHjO2MxNcPZ6kVzWymhz0Z5axPTHUJxbPkkFdNuba oVnayH4LtBqNtrJPJo91YWzHn; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:44502 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gxx0R-001AKk-Ra; Sun, 24 Feb 2019 10:51:59 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 16/17] Remove gdb_fildes_t Date: Sun, 24 Feb 2019 09:51:52 -0700 Message-Id: <20190224165153.5062-17-tom@tromey.com> In-Reply-To: <20190224165153.5062-1-tom@tromey.com> References: <20190224165153.5062-1-tom@tromey.com> gdb_fildes_t and pfildes are no longer used, so remove them. 2019-02-24 Tom Tromey * server.h (gdb_fildes_t): Remove typedef. * remote-utils.c (remote_desc, list_desc): Now int. (INVALID_DESCRIPTOR): Remove. (gdb_connected, remote_close) (check_remote_input_interrupt_request): Update. * utils.h (pfildes): Don't declare. * utils.c (pfildes): Remove. --- gdb/gdbserver/ChangeLog | 10 ++++++++++ gdb/gdbserver/remote-utils.c | 16 +++++----------- gdb/gdbserver/server.h | 7 ------- gdb/gdbserver/utils.c | 12 ------------ gdb/gdbserver/utils.h | 1 - 5 files changed, 15 insertions(+), 31 deletions(-) diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index bda261a4a9f..b1e4e869b69 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -77,12 +77,6 @@ typedef int socklen_t; #ifndef IN_PROCESS_AGENT -#if USE_WIN32API -# define INVALID_DESCRIPTOR INVALID_SOCKET -#else -# define INVALID_DESCRIPTOR -1 -#endif - /* Extra value for readchar_callback. */ enum { /* The callback is currently not scheduled. */ @@ -110,8 +104,8 @@ struct ui_file *gdb_stdlog; static int remote_is_stdio = 0; -static gdb_fildes_t remote_desc = INVALID_DESCRIPTOR; -static gdb_fildes_t listen_desc = INVALID_DESCRIPTOR; +static int remote_desc = -1; +static int listen_desc = -1; /* FIXME headerize? */ extern int using_threads; @@ -125,7 +119,7 @@ extern int debug_threads; int gdb_connected (void) { - return remote_desc != INVALID_DESCRIPTOR; + return remote_desc != -1; } /* Return true if the remote connection is over stdio. */ @@ -431,7 +425,7 @@ remote_close (void) if (! remote_connection_is_stdio ()) close (remote_desc); #endif - remote_desc = INVALID_DESCRIPTOR; + remote_desc = -1; reset_readchar (); } @@ -794,7 +788,7 @@ check_remote_input_interrupt_request (void) /* This function may be called before establishing communications, therefore we need to validate the remote descriptor. */ - if (remote_desc == INVALID_DESCRIPTOR) + if (remote_desc == -1) return; input_interrupt (0); diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 5b359c8bae0..e6a8dcc9bf1 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -78,13 +78,6 @@ extern int disable_packet_qfThreadInfo; extern int run_once; extern int non_stop; -#if USE_WIN32API -#include -typedef SOCKET gdb_fildes_t; -#else -typedef int gdb_fildes_t; -#endif - #include "common/event-loop.h" /* Functions from server.c. */ diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c index 79a7e80f625..ed5c7fb4e11 100644 --- a/gdb/gdbserver/utils.c +++ b/gdb/gdbserver/utils.c @@ -125,15 +125,3 @@ paddress (CORE_ADDR addr) { return phex_nz (addr, sizeof (CORE_ADDR)); } - -/* Convert a file descriptor into a printable string. */ - -char * -pfildes (gdb_fildes_t fd) -{ -#if USE_WIN32API - return phex_nz (fd, sizeof (gdb_fildes_t)); -#else - return plongest (fd); -#endif -} diff --git a/gdb/gdbserver/utils.h b/gdb/gdbserver/utils.h index 2bc7a6ecab9..dfc9c936892 100644 --- a/gdb/gdbserver/utils.h +++ b/gdb/gdbserver/utils.h @@ -20,6 +20,5 @@ #define GDBSERVER_UTILS_H char *paddress (CORE_ADDR addr); -char *pfildes (gdb_fildes_t fd); #endif /* GDBSERVER_UTILS_H */