* exec.c (xfer_memory): Add attrib argument.

[deliverable/binutils-gdb.git] / gdb / remote-vx.c

diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 87c0c5ec7dd93e1afdf04e71b25ab036e970eb67..4503e773244a4b8fd75bb4e9392482c08e1b7fe0 100644 (file)
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -1,5 +1,5 @@
 /* Memory-access and commands for remote VxWorks processes, for GDB.
-   Copyright (C) 1990-95, 1997-98, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1990-95, 1997-98, 1999, 2001 Free Software Foundation, Inc.
    Contributed by Wind River Systems and Cygnus Support.
 
    This file is part of GDB.
@@ -476,7 +476,8 @@ vx_prepare_to_store (void)
 
 static int
 vx_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
-               struct target_ops *target)
+               struct mem_attrib *attrib ATTRIBUTE_UNUSED,
+               struct target_ops *target ATTRIBUTE_UNUSED)
 {
   int status;
   Rptrace ptrace_in;
@@ -700,7 +701,7 @@ vx_load_command (char *arg_string, int from_tty)
     error ("The load command takes a file name");
 
   arg_string = tilde_expand (arg_string);
-  make_cleanup (free, arg_string);
+  make_cleanup (xfree, arg_string);
 
   dont_repeat ();
 
@@ -713,7 +714,7 @@ vx_load_command (char *arg_string, int from_tty)
 Kill the target task? "))
        target_kill ();
       else
-       error ("Load cancelled.");
+       error ("Load canceled.");
     }
 
   QUIT;
@@ -1209,7 +1210,7 @@ vx_attach (char *args, int from_tty)
   push_target (&vx_run_ops);
 
   if (vx_running)
-    free (vx_running);
+    xfree (vx_running);
   vx_running = 0;
 }
 
@@ -1294,7 +1295,7 @@ vx_proc_close (int quitting)
 {
   inferior_pid = 0;            /* No longer have a process.  */
   if (vx_running)
-    free (vx_running);
+    xfree (vx_running);
   vx_running = 0;
 }
 \f
@@ -1325,7 +1326,7 @@ vx_close (int quitting)
   pClient = 0;
 
   if (vx_host)
-    free (vx_host);            /* The hostname */
+    xfree (vx_host);           /* The hostname */
   vx_host = 0;
 }