From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 56861 invoked by alias); 12 Jul 2018 20:52:37 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 56627 invoked by uid 89); 12 Jul 2018 20:52:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.50.84) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Jul 2018 20:52:33 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 8742E250F for ; Thu, 12 Jul 2018 15:52:32 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id diZRf0mMSBcCXdiZcfhqmz; Thu, 12 Jul 2018 15:52:31 -0500 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=jQsLLoT9NnKxEs86i7tBDHG+9iG/wzc1Enuw1b/t+iY=; b=C1y3+25TnKWGiqAIW2XYRaYMcf pNGh1hrSgObHMIG+vZ9XMxu0W++5T93OedFop2bX6TuL9xF9PRe6p7wy0Oz+ZpGr1ON9tLX8pi5S7 3CcnhHzyoFeNgvITdP2DjSH/W; Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:49432 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fdiZR-001ZuD-Pl; Thu, 12 Jul 2018 15:52:13 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 11/13] Remove unused variables from gdbserver Date: Thu, 12 Jul 2018 20:52:00 -0000 Message-Id: <20180712205208.32646-12-tom@tromey.com> In-Reply-To: <20180712205208.32646-1-tom@tromey.com> References: <20180712205208.32646-1-tom@tromey.com> X-SW-Source: 2018-07/txt/msg00356.txt.bz2 This removes a few unused variables from gdbserver. The x86-tdesc.h change is a bit unusual for this series. This file was not defining the multiple-include guard symbol, so I've added that here. Also, it is hard to determine when i386_expedite_regs will be needed, so this patch simply marks it ATTRIBUTE_UNUSED. 2018-07-12 Tom Tromey * win32-low.c (win32_create_inferior): Remove unused variables. * gdbreplay.c (remote_open): Remove unused variable. * remote-utils.c (remote_prepare): Remove unused variable. * x86-tdesc.h (X86_TDESC_H): Define. (amd64_expedite_regs): Define conditionally. (i386_expedite_regs): Mark ATTRIBUTE_UNUSED. * linux-x86-tdesc.c (i386_tdescs): Move inside #if. * remote-utils.c (readchar): Remove unused variable. --- gdb/gdbserver/ChangeLog | 11 +++++++++++ gdb/gdbserver/gdbreplay.c | 1 - gdb/gdbserver/linux-x86-tdesc.c | 4 ++-- gdb/gdbserver/remote-utils.c | 2 -- gdb/gdbserver/win32-low.c | 2 -- gdb/gdbserver/x86-tdesc.h | 6 +++++- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c index 026bbfccaf0..b05209c4d14 100644 --- a/gdb/gdbserver/gdbreplay.c +++ b/gdb/gdbserver/gdbreplay.c @@ -157,7 +157,6 @@ remote_open (char *name) #ifdef USE_WIN32API static int winsock_initialized; #endif - char *port_str; int tmp; int tmp_desc; struct addrinfo hint; diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c index c3aa20c982c..93122bffe83 100644 --- a/gdb/gdbserver/linux-x86-tdesc.c +++ b/gdb/gdbserver/linux-x86-tdesc.c @@ -69,10 +69,10 @@ xcr0_to_tdesc_idx (uint64_t xcr0, bool is_x32) return X86_TDESC_LAST; } -static struct target_desc *i386_tdescs[X86_TDESC_LAST] = { }; - #if defined __i386__ || !defined IN_PROCESS_AGENT +static struct target_desc *i386_tdescs[X86_TDESC_LAST] = { }; + /* Return the target description according to XCR0. */ const struct target_desc * diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 1734c54e39a..38c90324288 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -231,7 +231,6 @@ void remote_prepare (const char *name) { client_state &cs = get_client_state (); - const char *port_str; #ifdef USE_WIN32API static int winsock_initialized; #endif @@ -902,7 +901,6 @@ static unsigned char *readchar_bufp; static int readchar (void) { - client_state &cs = get_client_state (); int ch; if (readchar_bufcnt == 0) diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c index 8a20972bd4e..8276a2a3d55 100644 --- a/gdb/gdbserver/win32-low.c +++ b/gdb/gdbserver/win32-low.c @@ -634,8 +634,6 @@ win32_create_inferior (const char *program, #endif BOOL ret; DWORD flags; - int argslen; - int argc; PROCESS_INFORMATION pi; DWORD err; std::string str_program_args = stringify_argv (program_args); diff --git a/gdb/gdbserver/x86-tdesc.h b/gdb/gdbserver/x86-tdesc.h index c1641b2760f..48abd39b1ba 100644 --- a/gdb/gdbserver/x86-tdesc.h +++ b/gdb/gdbserver/x86-tdesc.h @@ -16,11 +16,15 @@ along with this program. If not, see . */ #ifndef X86_TDESC_H +#define X86_TDESC_H /* The "expedite" registers for x86 targets. */ -static const char *i386_expedite_regs[] = {"ebp", "esp", "eip", NULL}; +static const char *i386_expedite_regs[] ATTRIBUTE_UNUSED + = {"ebp", "esp", "eip", NULL}; +#ifdef __x86_64__ /* The "expedite" registers for x86_64 targets. */ static const char *amd64_expedite_regs[] = {"rbp", "rsp", "rip", NULL}; +#endif #endif /* X86_TDESC_H */ -- 2.13.6