OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove gdb_fildes_t 

gdb_fildes_t and pfildes are no longer used, so remove them.

gdbserver/ChangeLog
2020-04-13  Tom Tromey  <tom@tromey.com>

	* 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.
This commit is contained in:
Tom Tromey 2020-04-13 12:42:59 -06:00 committed by Tom Tromey
parent 7990abcc9b
commit 73944e9f63
5 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdbserver/ChangeLog
View File

@ -1,3 +1,13 @@
2020-04-13 Tom Tromey <tom@tromey.com>
* 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.
2020-04-13 Tom Tromey <tom@tromey.com>
* server.h (handle_serial_event, handle_target_event): Update.

16
gdbserver/remote-utils.cc
View File

@ -78,12 +78,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. */
@ -108,8 +102,8 @@ struct sym_cache
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;
#ifdef USE_WIN32API
# define read(fd, buf, len) recv (fd, (char *) buf, len, 0)
@ -119,7 +113,7 @@ static gdb_fildes_t listen_desc = INVALID_DESCRIPTOR;
int
gdb_connected (void)
{
return remote_desc != INVALID_DESCRIPTOR;
return remote_desc != -1;
}
/* Return true if the remote connection is over stdio. */
@ -425,7 +419,7 @@ remote_close (void)
if (! remote_connection_is_stdio ())
close (remote_desc);
#endif
remote_desc = INVALID_DESCRIPTOR;
remote_desc = -1;
reset_readchar ();
}
@ -788,7 +782,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);

7
gdbserver/server.h
View File

@ -81,13 +81,6 @@ extern bool disable_packet_T;
extern bool run_once;
extern bool non_stop;
#if USE_WIN32API
#include <winsock2.h>
typedef SOCKET gdb_fildes_t;
#else
typedef int gdb_fildes_t;
#endif
#include "gdbsupport/event-loop.h"
/* Functions from server.c. */

12
gdbserver/utils.cc
View File

@ -113,15 +113,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
}

1
gdbserver/utils.h
View File

@ -20,6 +20,5 @@
#define GDBSERVER_UTILS_H
char *paddress (CORE_ADDR addr);
char *pfildes (gdb_fildes_t fd);
#endif /* GDBSERVER_UTILS_H */