Unbreak DJGPP build of GDB.

gdb/
	* go32-nat.c (go32_xfer_memory): Fix the return value to be
	compatible to what read_child and write_child return.  This
	unbreaks that DJGPP build of GDB which was broken since v7.7.

(cherry picked from commit 99cee7b71f81a9d346fc1a2f4e678537f1bb945f)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e932f2ac5c843a68e548f1db69fdb0247bd27bc..8976394d7a968ea8f689101d1b373511a1db26d4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-30  Eli Zaretskii  <eliz@gnu.org>
+
+       * go32-nat.c (go32_xfer_memory): Fix the return value to be
+       compatible to what read_child and write_child return.  This
+       unbreaks that DJGPP build of GDB which was broken since v7.7.
+
 2015-05-29  Roland McGrath  <mcgrathr@google.com>
 
        PR gdb/18464

diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index f3966cd534ec15e0f841e5f520a7b2bbbffd37a9..4f5c2d2336ebfda4abb2167bfcda25fd49a6acc9 100644 (file)
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -587,10 +587,12 @@ go32_xfer_memory (gdb_byte *readbuf, const gdb_byte *writebuf,
   else
     res = read_child (memaddr, readbuf, len);
 
-  if (res <= 0)
+  /* read_child and write_child return zero on success, non-zero on
+     failure.  */
+  if (res != 0)
     return TARGET_XFER_E_IO;
 
-  *xfered_len = res;
+  *xfered_len = len;
   return TARGET_XFER_OK;
 }