From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20143 invoked by alias); 21 Jul 2018 18:47:34 -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 19759 invoked by uid 89); 21 Jul 2018 18:47:30 -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=expedite, rbp, 69,10, 6910 X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.150.114) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 21 Jul 2018 18:47:26 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 6C08712A14A for ; Sat, 21 Jul 2018 13:47:25 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id gwubfYBdj79N3gwubftskI; Sat, 21 Jul 2018 13:47:25 -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=0ASykty38hdW3bmPNfvafnDAApNeNTyu687dqpuuos4=; b=XzsYxP59BaZgJCpEQ5bXuaeT1i ljaYNezR66qNW6IIafnra7KfFwrvXeHLAVwXdeSbF7CFGua9FuLiy709S2Sj4/uLSDjnoPNvCFyiM jdXnhHbJusj+o8g+CWK7B4bgQ; Received: from 75-166-85-72.hlrn.qwest.net ([75.166.85.72]:44394 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fgwub-002Auc-7w; Sat, 21 Jul 2018 13:47:25 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v2 11/13] Remove unused variables from gdbserver Date: Sat, 21 Jul 2018 18:47:00 -0000 Message-Id: <20180721184720.3263-12-tom@tromey.com> In-Reply-To: <20180721184720.3263-1-tom@tromey.com> References: <20180721184720.3263-1-tom@tromey.com> X-SW-Source: 2018-07/txt/msg00635.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. gdb/gdbserver/ChangeLog 2018-07-21 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 | 10 ++++++++-- 6 files changed, 21 insertions(+), 9 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 765391dd477..4aed58d3b8e 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..d0920b0006f 100644 --- a/gdb/gdbserver/x86-tdesc.h +++ b/gdb/gdbserver/x86-tdesc.h @@ -16,11 +16,17 @@ 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}; +/* The "expedite" registers for x86 targets. Since whether the + variable is used depends on host/configuration, we mark it + ATTRIBUTE_UNUSED to keep it simple here. */ +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