Remove some warnings:

	* generic/gdbtk-hooks.c (gdbtk_pre_add_symbol): Cast `name'.
	* generic/gdbtk-cmds.c (gdbtk_dis_asm_read_memory): Remove.

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index b3c7036..0720150 100644 (file)
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-13  Ben Elliston  <bje@au.ibm.com>
+
+       Remove some warnings:
+       * generic/gdbtk-hooks.c (gdbtk_pre_add_symbol): Cast `name'.
+       * generic/gdbtk-cmds.c (gdbtk_dis_asm_read_memory): Remove.
+
 2004-12-08  Keith Seitz  <kseitz@sources.redhat.com>
 
        * library/download.ith (completed_steps): New variable.

diff --git a/gdb/gdbtk/generic/gdbtk-cmds.c b/gdb/gdbtk/generic/gdbtk-cmds.c
index f02555f..389ca5f 100644 (file)
--- a/gdb/gdbtk/generic/gdbtk-cmds.c
+++ b/gdb/gdbtk/generic/gdbtk-cmds.c
@@ -180,8 +180,6 @@ static int gdb_stop (ClientData, Tcl_Interp *, int, Tcl_Obj * CONST[]);
 static int gdb_target_has_execution_command (ClientData,
                                             Tcl_Interp *, int,
                                             Tcl_Obj * CONST[]);
-static int gdbtk_dis_asm_read_memory (bfd_vma, bfd_byte *, unsigned int,
-                                     disassemble_info *);
 static void gdbtk_load_source (ClientData clientData,
                               struct symtab *symtab,
                               int start_line, int end_line);
@@ -2077,27 +2075,6 @@ gdb_disassemble_driver (CORE_ADDR low, CORE_ADDR high,
   return TCL_OK;
 }
 
-/* This is the memory_read_func for gdb_disassemble_driver when we are
-   disassembling from the exec file. */
-
-static int
-gdbtk_dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
-                          unsigned int len, disassemble_info *info)
-{
-  extern struct target_ops exec_ops;
-  int res;
-
-  errno = 0;
-  res = xfer_memory (memaddr, myaddr, len, 0, 0, &exec_ops);
-
-  if (res == len)
-    return 0;
-  else if (errno == 0)
-    return EIO;
-  else
-    return errno;
-}
-
 /* This will be passed to qsort to sort the results of the disassembly */
 
 static int

diff --git a/gdb/gdbtk/generic/gdbtk-hooks.c b/gdb/gdbtk/generic/gdbtk-hooks.c
index bd8d020..c01a305 100644 (file)
--- a/gdb/gdbtk/generic/gdbtk-hooks.c
+++ b/gdb/gdbtk/generic/gdbtk-hooks.c
@@ -597,7 +597,7 @@ gdbtk_load_hash (const char *section, unsigned long num)
 static void
 gdbtk_pre_add_symbol (const char *name)
 {
-  gdbtk_two_elem_cmd ("gdbtk_tcl_pre_add_symbol", name);
+  gdbtk_two_elem_cmd ("gdbtk_tcl_pre_add_symbol", (char *) name);
 }
 
 /* This hook is called whenever we finish loading a symbol file. */