[RFA 11/13] Remove unused variables from gdbserver

Tom Tromey
2018-07-12T20:52:37Z

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 <tom@tromey.com>

* 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 <http://www.gnu.org/licenses/>. */

#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