From ab29043019ae2aaebe686d15aa460780280b6f66 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 27 Aug 2015 13:37:01 +0100 Subject: [PATCH] gdbserver/proc-service.c: bogus return value conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building in C++ mode shows: int write_inferior_memory (CORE_ADDR memaddr, const unsigned char *myaddr, ^ src/gdb/gdbserver/proc-service.c:93:64: error: invalid conversion from ‘int’ to ‘ps_err_e’ [-fpermissive] return write_inferior_memory ((unsigned long) addr, buf, size); ^ It only works today by accident, write_inferior_memory does not return a ps_err_e. gdb/gdbserver/ChangeLog: 2015-08-27 Pedro Alves * proc-service.c (ps_pdwrite): Return PS_ERR/PS_OK explicily. --- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/proc-service.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 5b9b170591..0be303076e 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2015-08-27 Pedro Alves + + * proc-service.c (ps_pdwrite): Return PS_ERR/PS_OK explicily. + 2015-08-26 Simon Marchi * ax.c (gdb_parse_agent_expr): Likewise. diff --git a/gdb/gdbserver/proc-service.c b/gdb/gdbserver/proc-service.c index f36e3fb600..128939dc2f 100644 --- a/gdb/gdbserver/proc-service.c +++ b/gdb/gdbserver/proc-service.c @@ -90,7 +90,9 @@ ps_err_e ps_pdwrite (gdb_ps_prochandle_t ph, psaddr_t addr, gdb_ps_write_buf_t buf, gdb_ps_size_t size) { - return write_inferior_memory ((unsigned long) addr, buf, size); + if (write_inferior_memory ((unsigned long) addr, buf, size) != 0) + return PS_ERR; + return PS_OK; } /* Get the general registers of LWP LWPID within the target process PH