2003-11-10 Andrew Cagney <cagney@redhat.com>

	* target.h (struct target_ops): Order xfer buffer parameters "read
	write" not "write read".
	* bfd-target.c (target_bfd_xfer_partial): Update.
	* remote.c (remote_xfer_partial): Update.
	* inftarg.c (child_xfer_partial): Update.
	* target.c (default_xfer_partial): Update.
	(target_read_partial, target_write_partial): Update.
	(debug_to_xfer_partial): Update.

6 files changed, 35 insertions, 29 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4b57c78e58f..04a0bb88d54 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
 2003-11-10  Andrew Cagney  <cagney@redhat.com>
 
+	* target.h (struct target_ops): Order xfer buffer parameters "read
+	write" not "write read".
+	* bfd-target.c (target_bfd_xfer_partial): Update.
+	* remote.c (remote_xfer_partial): Update.
+	* inftarg.c (child_xfer_partial): Update.
+	* target.c (default_xfer_partial): Update.
+	(target_read_partial, target_write_partial): Update.
+	(debug_to_xfer_partial): Update.
+
 	* arch-utils.h, arch-utils.c: Fix typo in comment.
 
 	* arch-utils.c (deprecated_select_gdbarch_hack): Delete function.
diff --git a/gdb/bfd-target.c b/gdb/bfd-target.c
index 39cc73f5a91..ee16d85f52a 100644
--- a/gdb/bfd-target.c
+++ b/gdb/bfd-target.c
@@ -71,8 +71,8 @@ build_target_sections_from_bfd (struct target_ops *targ, struct bfd *abfd)
 LONGEST
 target_bfd_xfer_partial (struct target_ops *ops,
 			 enum target_object object,
-			 const char *annex, const void *writebuf, 
-			 void *readbuf, ULONGEST offset, LONGEST len)
+			 const char *annex, void *readbuf,
+			 const void *writebuf, ULONGEST offset, LONGEST len)
 {
   switch (object)
     {
diff --git a/gdb/inftarg.c b/gdb/inftarg.c
index fd02ad03cf2..6829400b592 100644
--- a/gdb/inftarg.c
+++ b/gdb/inftarg.c
@@ -556,10 +556,9 @@ child_core_file_to_sym_file (char *core)
    memory transfers, fall back to the old memory xfer functions.  */
 
 static LONGEST
-child_xfer_partial (struct target_ops *ops,
-		    enum target_object object,
-		    const char *annex, const void *writebuf,
-		    void *readbuf, ULONGEST offset, LONGEST len)
+child_xfer_partial (struct target_ops *ops, enum target_object object,
+		    const char *annex, void *readbuf,
+		    const void *writebuf, ULONGEST offset, LONGEST len)
 {
   switch (object)
     {
@@ -577,13 +576,13 @@ child_xfer_partial (struct target_ops *ops,
 #ifndef NATIVE_XFER_UNWIND_TABLE
 #define NATIVE_XFER_UNWIND_TABLE(OPS,OBJECT,ANNEX,WRITEBUF,READBUF,OFFSET,LEN) (-1)
 #endif
-      return NATIVE_XFER_UNWIND_TABLE (ops, object, annex, writebuf,
-				       readbuf, offset, len);
+      return NATIVE_XFER_UNWIND_TABLE (ops, object, annex, readbuf, writebuf,
+				       offset, len);
 #endif
 
 #if 0
     case TARGET_OBJECT_AUXV:
-      return native_xfer_auxv (PIDGET (inferior_ptid), writebuf, readbuf,
+      return native_xfer_auxv (PIDGET (inferior_ptid), readbuf, writebuf,
 			       offset, len);
 #endif
 
diff --git a/gdb/remote.c b/gdb/remote.c
index 1e464dd0bce..d6df76adb91 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -5103,7 +5103,7 @@ the loaded file\n");
 
 static LONGEST
 remote_xfer_partial (struct target_ops *ops, enum target_object object,
-		     const char *annex, const void *writebuf, void *readbuf,
+		     const char *annex, void *readbuf, const void *writebuf,
 		     ULONGEST offset, LONGEST len)
 {
   struct remote_state *rs = get_remote_state ();
diff --git a/gdb/target.c b/gdb/target.c
index 93087608b2d..7e088b93b96 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -75,9 +75,9 @@ static void normal_target_post_startup_inferior (ptid_t ptid);
 
 static LONGEST default_xfer_partial (struct target_ops *ops,
 				     enum target_object object,
-				     const char *annex, const void *writebuf,
-				     void *readbuf, ULONGEST offset,
-				     LONGEST len);
+				     const char *annex, void *readbuf,
+				     const void *writebuf,
+				     ULONGEST offset, LONGEST len);
 
 /* Transfer LEN bytes between target address MEMADDR and GDB address
    MYADDR.  Returns 0 for success, errno code for failure (which
@@ -1074,10 +1074,9 @@ target_write_memory_partial (CORE_ADDR memaddr, char *buf, int len, int *err)
 /* More generic transfers.  */
 
 static LONGEST
-default_xfer_partial (struct target_ops *ops,
-		      enum target_object object,
-		      const char *annex, const void *writebuf,
-		      void *readbuf, ULONGEST offset, LONGEST len)
+default_xfer_partial (struct target_ops *ops, enum target_object object,
+		      const char *annex, void *readbuf, 
+		      const void *writebuf, ULONGEST offset, LONGEST len)
 {
   if (object == TARGET_OBJECT_MEMORY
       && ops->to_xfer_memory != NULL)
@@ -1109,7 +1108,7 @@ default_xfer_partial (struct target_ops *ops,
     }
   else if (ops->beneath != NULL)
     return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
-					  writebuf, readbuf, offset, len);
+					  readbuf, writebuf, offset, len);
   else
     return -1;
 }
@@ -1127,7 +1126,7 @@ target_read_partial (struct target_ops *ops,
 		     ULONGEST offset, LONGEST len)
 {
   gdb_assert (ops->to_xfer_partial != NULL);
-  return ops->to_xfer_partial (ops, object, annex, NULL, buf, offset, len);
+  return ops->to_xfer_partial (ops, object, annex, buf, NULL, offset, len);
 }
 
 LONGEST
@@ -1137,7 +1136,7 @@ target_write_partial (struct target_ops *ops,
 		      ULONGEST offset, LONGEST len)
 {
   gdb_assert (ops->to_xfer_partial != NULL);
-  return ops->to_xfer_partial (ops, object, annex, buf, NULL, offset, len);
+  return ops->to_xfer_partial (ops, object, annex, NULL, buf, offset, len);
 }
 
 /* Wrappers to perform the full transfer.  */
@@ -2289,20 +2288,19 @@ debug_to_stop (void)
 }
 
 static LONGEST
-debug_to_xfer_partial (struct target_ops *ops,
-		       enum target_object object,
-		       const char *annex, const void *writebuf,
-		       void *readbuf, ULONGEST offset, LONGEST len)
+debug_to_xfer_partial (struct target_ops *ops, enum target_object object,
+		       const char *annex, void *readbuf, const void *writebuf,
+		       ULONGEST offset, LONGEST len)
 {
   LONGEST retval;
 
   retval = debug_target.to_xfer_partial (&debug_target, object, annex,
-					 writebuf, readbuf, offset, len);
+					 readbuf, writebuf, offset, len);
 
   fprintf_unfiltered (gdb_stdlog,
 		      "target_xfer_partial (%d, %s, 0x%lx,  0x%lx,  0x%s, %s) = %s\n",
 		      (int) object, (annex ? annex : "(null)"),
-		      (long) writebuf, (long) readbuf, paddr_nz (offset),
+		      (long) readbuf, (long) writebuf, paddr_nz (offset),
 		      paddr_d (len), paddr_d (retval));
 
   return retval;
diff --git a/gdb/target.h b/gdb/target.h
index 4d10f02588f..42b95964964 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -410,9 +410,9 @@ struct target_ops
        and target_write_partial for details of each variant.  One, and
        only one, of readbuf or writebuf must be non-NULL.  */
     LONGEST (*to_xfer_partial) (struct target_ops *ops,
-				enum target_object object,
-				const char *annex, const void *writebuf,
-				void *readbuf, ULONGEST offset, LONGEST len);
+				enum target_object object, const char *annex,
+				void *readbuf, const void *writebuf, 
+				ULONGEST offset, LONGEST len);
 
     int to_magic;
     /* Need sub-structure for target machine related rather than comm related?