gdb/

[deliverable/binutils-gdb.git] / gdb / target-memory.c

diff --git a/gdb/target-memory.c b/gdb/target-memory.c
index 78f9d9c31cda6f3d1e1c5dc8c5c5b3bdf8a52149..84793538190ae5f62b0e098edc48c58053d8a05d 100644 (file)
--- a/gdb/target-memory.c
+++ b/gdb/target-memory.c
@@ -1,7 +1,7 @@
 /* Parts of target interface that deal with accessing memory and memory-like
    objects.
 
-   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -84,10 +84,10 @@ claim_memory (VEC(memory_write_request_s) *blocks,
        {
          struct memory_write_request *n =
            VEC_safe_push (memory_write_request_s, *result, NULL);
-         memset (n, 0, sizeof (struct memory_write_request));
+         *n = *r;
          n->begin = claimed_begin;
          n->end = claimed_end;
-         n->data = r->data + (claimed_begin - r->begin);
+         n->data += claimed_begin - r->begin;
        }
     }
 }
@@ -393,7 +393,7 @@ target_write_memory_blocks (VEC(memory_write_request_s) *requests,
     {
       LONGEST len;
 
-      len = target_write_with_progress (&current_target,
+      len = target_write_with_progress (current_target.beneath,
                                        TARGET_OBJECT_MEMORY, NULL,
                                        r->data, r->begin, r->end - r->begin,
                                        progress_cb, r->baton);