diff options
author | Pedro Alves <palves@redhat.com> | 2013-04-19 15:26:17 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2013-04-19 15:26:17 +0000 |
commit | c628b528e091211bd746e5c9b18b5bc7298d01f3 (patch) | |
tree | 6c324664ccf9646b04e3e56162d4b3f6d3b69ff6 /gdb/ser-base.c | |
parent | 51a5cd9059b96a2ac33cf149d369db12b891fd96 (diff) | |
download | gdb-c628b528e091211bd746e5c9b18b5bc7298d01f3.zip gdb-c628b528e091211bd746e5c9b18b5bc7298d01f3.tar.gz gdb-c628b528e091211bd746e5c9b18b5bc7298d01f3.tar.bz2 |
serial_write: change prototype to take a void-pointer buffer.
While remote.c works with "char *" buffers most of the time, other
remote targets have binary-ish-er protocols, and choose to use
"unsigned char" throughout, like e.g., remote-mips.c or
remote-m32r-sdi.c. That results in -Wpointer-sign warnings in those
targets, unless we add casts in calls to serial_write. Since
serial_write is only concerned about sending raw host bytes out, and
serial_ops->write_prim already works with "void *"/"size_t", a similar
interface to the "write" or "send" system calls, I find it natural to
change serial_write's prototype accordingly, avoiding the need for
casts.
Tested on x86_64 Fedora 17, and also by building x86_64-mingw32
and DJGPP/go32 -hosted gdbs.
gdb/
2013-04-19 Pedro Alves <palves@redhat.com>
* ser-base.c (ser_base_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
* ser-base.h (ser_base_write): Adjust.
* ser-go32.c (cnts): Change type to size_t.
(dos_write): Change prototype -- take 'void *'
buffer and size_t size. Adjust.
(dos_info): Print elements of 'cnts' as unsigned long.
* serial.c (serial_write): Likewise.
* serial.h (serial_write): Adjust.
(struct serial_ops) <write>: Change prototype -- take 'void *'
buffer and size_t size. Adjust.
Diffstat (limited to 'gdb/ser-base.c')
-rw-r--r-- | gdb/ser-base.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gdb/ser-base.c b/gdb/ser-base.c index c602650..52c5726 100644 --- a/gdb/ser-base.c +++ b/gdb/ser-base.c @@ -440,17 +440,18 @@ ser_base_readchar (struct serial *scb, int timeout) } int -ser_base_write (struct serial *scb, const char *str, int len) +ser_base_write (struct serial *scb, const void *buf, size_t count) { + const char *str = buf; int cc; - while (len > 0) + while (count > 0) { - cc = scb->ops->write_prim (scb, str, len); + cc = scb->ops->write_prim (scb, str, count); if (cc < 0) return 1; - len -= cc; + count -= cc; str += cc; } return 0; |