* remote-fileio.c (remote_fileio_return_success): Take a gdb_byte

argument.
	(remote_fileio_func_open, remote_fileio_func_rename)
	(remote_fileio_func_unlink, remote_fileio_func_stat)
	(remote_fileio_func_fstat, remote_fileio_func_gettimeofday)
	(remote_fileio_func_system): Cast the arguments to
	remote_read_bytes and remote_write_bytes.
	(remote_fileio_func_read, remote_fileio_func_write): Use a
	gdb_byte buffer.
	* remote.h (remote_read_bytes, remote_write_bytes): Update
	prototypes.
	* remote.c (hex2bin, bin2hex): Use gdb_byte for the BIN argument.
	(threadref_to_int): Replace bogus char * cast.
	(remote_unpack_thread_info_response): Use int for tag.
	(remote_threads_extra_info, remote_check_symbols): Cast string
	arguments to hex2bin.
	(remote_wait): Use a char buffer for packets and a gdb_byte
	buffer for registers.
	(remote_async_wait): Likewise.
	(remote_prepare_to_store, store_register_using_P)
	(remote_store_registers): Use gdb_byte buffers.
	(remote_write_bytes, remote_read_bytes): Use a gdb_byte pointer
	for MYADDR and char buffers for strings.
	(remote_xfer_partial): Add casts for string operations on READBUF.
	(remote_rcmd): Cast strings passed to bin2hex.
This commit is contained in:
Daniel Jacobowitz
2006-01-17 14:11:16 +00:00
parent b56cbdb94b
commit cfd77fa13e
4 changed files with 87 additions and 59 deletions

View File

@@ -570,7 +570,7 @@ remote_fileio_return_success (int retcode)
write only one packet, regardless of the requested number of bytes to
transfer. This wrapper calls remote_write_bytes() as often as needed. */
static int
remote_fileio_write_bytes (CORE_ADDR memaddr, char *myaddr, int len)
remote_fileio_write_bytes (CORE_ADDR memaddr, gdb_byte *myaddr, int len)
{
int ret = 0, written;
@@ -618,7 +618,7 @@ remote_fileio_func_open (char *buf)
/* Request pathname using 'm' packet */
pathname = alloca (length);
retlength = remote_read_bytes (ptrval, pathname, length);
retlength = remote_read_bytes (ptrval, (gdb_byte *) pathname, length);
if (retlength != length)
{
remote_fileio_ioerror ();
@@ -688,7 +688,7 @@ remote_fileio_func_read (char *buf)
LONGEST lnum;
CORE_ADDR ptrval;
int fd, ret, retlength;
char *buffer;
gdb_byte *buffer;
size_t length;
off_t old_offset, new_offset;
@@ -729,7 +729,7 @@ remote_fileio_func_read (char *buf)
static char *remaining_buf = NULL;
static int remaining_length = 0;
buffer = (char *) xmalloc (32768);
buffer = (gdb_byte *) xmalloc (32768);
if (remaining_buf)
{
remote_fio_no_longjmp = 1;
@@ -751,7 +751,7 @@ remote_fileio_func_read (char *buf)
}
else
{
ret = ui_file_read (gdb_stdtargin, buffer, 32767);
ret = ui_file_read (gdb_stdtargin, (char *) buffer, 32767);
remote_fio_no_longjmp = 1;
if (ret > 0 && (size_t)ret > length)
{
@@ -764,7 +764,7 @@ remote_fileio_func_read (char *buf)
}
break;
default:
buffer = (char *) xmalloc (length);
buffer = (gdb_byte *) xmalloc (length);
/* POSIX defines EINTR behaviour of read in a weird way. It's allowed
for read() to return -1 even if "some" bytes have been read. It
has been corrected in SUSv2 but that doesn't help us much...
@@ -806,7 +806,7 @@ remote_fileio_func_write (char *buf)
LONGEST lnum;
CORE_ADDR ptrval;
int fd, ret, retlength;
char *buffer;
gdb_byte *buffer;
size_t length;
/* 1. Parameter: file descriptor */
@@ -836,7 +836,7 @@ remote_fileio_func_write (char *buf)
}
length = (size_t) num;
buffer = (char *) xmalloc (length);
buffer = (gdb_byte *) xmalloc (length);
retlength = remote_read_bytes (ptrval, buffer, length);
if (retlength != length)
{
@@ -852,8 +852,8 @@ remote_fileio_func_write (char *buf)
remote_fileio_badfd ();
return;
case FIO_FD_CONSOLE_OUT:
ui_file_write (target_fd == 1 ? gdb_stdtarg : gdb_stdtargerr, buffer,
length);
ui_file_write (target_fd == 1 ? gdb_stdtarg : gdb_stdtargerr,
(char *) buffer, length);
gdb_flush (target_fd == 1 ? gdb_stdtarg : gdb_stdtargerr);
ret = length;
break;
@@ -943,7 +943,7 @@ remote_fileio_func_rename (char *buf)
}
/* Request oldpath using 'm' packet */
oldpath = alloca (length);
retlength = remote_read_bytes (ptrval, oldpath, length);
retlength = remote_read_bytes (ptrval, (gdb_byte *) oldpath, length);
if (retlength != length)
{
remote_fileio_ioerror ();
@@ -957,7 +957,7 @@ remote_fileio_func_rename (char *buf)
}
/* Request newpath using 'm' packet */
newpath = alloca (length);
retlength = remote_read_bytes (ptrval, newpath, length);
retlength = remote_read_bytes (ptrval, (gdb_byte *) newpath, length);
if (retlength != length)
{
remote_fileio_ioerror ();
@@ -1034,7 +1034,7 @@ remote_fileio_func_unlink (char *buf)
}
/* Request pathname using 'm' packet */
pathname = alloca (length);
retlength = remote_read_bytes (ptrval, pathname, length);
retlength = remote_read_bytes (ptrval, (gdb_byte *) pathname, length);
if (retlength != length)
{
remote_fileio_ioerror ();
@@ -1076,7 +1076,7 @@ remote_fileio_func_stat (char *buf)
}
/* Request pathname using 'm' packet */
pathname = alloca (length);
retlength = remote_read_bytes (ptrval, pathname, length);
retlength = remote_read_bytes (ptrval, (gdb_byte *) pathname, length);
if (retlength != length)
{
remote_fileio_ioerror ();
@@ -1110,7 +1110,7 @@ remote_fileio_func_stat (char *buf)
remote_fileio_to_fio_stat (&st, &fst);
remote_fileio_to_fio_uint (0, fst.fst_dev);
retlength = remote_fileio_write_bytes (ptrval, (char *) &fst, sizeof fst);
retlength = remote_fileio_write_bytes (ptrval, (gdb_byte *) &fst, sizeof fst);
if (retlength != sizeof fst)
{
remote_fileio_return_errno (-1);
@@ -1193,7 +1193,7 @@ remote_fileio_func_fstat (char *buf)
{
remote_fileio_to_fio_stat (&st, &fst);
retlength = remote_fileio_write_bytes (ptrval, (char *) &fst, sizeof fst);
retlength = remote_fileio_write_bytes (ptrval, (gdb_byte *) &fst, sizeof fst);
if (retlength != sizeof fst)
{
remote_fileio_return_errno (-1);
@@ -1245,7 +1245,7 @@ remote_fileio_func_gettimeofday (char *buf)
{
remote_fileio_to_fio_timeval (&tv, &ftv);
retlength = remote_fileio_write_bytes (ptrval, (char *) &ftv, sizeof ftv);
retlength = remote_fileio_write_bytes (ptrval, (gdb_byte *) &ftv, sizeof ftv);
if (retlength != sizeof ftv)
{
remote_fileio_return_errno (-1);
@@ -1297,7 +1297,7 @@ remote_fileio_func_system (char *buf)
}
/* Request commandline using 'm' packet */
cmdline = alloca (length);
retlength = remote_read_bytes (ptrval, cmdline, length);
retlength = remote_read_bytes (ptrval, (gdb_byte *) cmdline, length);
if (retlength != length)
{
remote_fileio_ioerror ();