Some "-Wall" cleanups.

	* generic/gdbtk-hooks.c (x_event): Remove unused variable "count".
	(tracepoint_notify): Remove superfluous declaration. This funtion
	was moved to gdbtk-bp.c.

	* generic/gdbtk-bp.c (gdb_find_bp_at_addr): Remove unused variable
	"b".
	(gdb_set_bp): Remove unused variable "cmd".
	(gdb_set_bp_addr): Remove unused variables "cmd" and "filename".

	* generic/gdbtk.c (gdbtk_init): Remove unused variables
	"auto_path_name", "auto_path_elem", and "found_main".

4 files changed, 17 insertions, 9 deletions

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index fd36bf9d219..28316abe6ab 100644
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,4 +1,19 @@
+2001-06-07  Keith Seitz  <keiths@redhat.com>
+
+	* generic/gdbtk-hooks.c (x_event): Remove unused variable "count".
+	(tracepoint_notify): Remove superfluous declaration. This funtion
+	was moved to gdbtk-bp.c.
+
+	* generic/gdbtk-bp.c (gdb_find_bp_at_addr): Remove unused variable
+	"b".
+	(gdb_set_bp): Remove unused variable "cmd".
+	(gdb_set_bp_addr): Remove unused variables "cmd" and "filename".
+
+	* generic/gdbtk.c (gdbtk_init): Remove unused variables
+	"auto_path_name", "auto_path_elem", and "found_main".
+
 2001-06-05  Martin Hunt  <hunt@redhat.com>                                    
+
 	* generic/gdbtk.c (_initialize_gdbtk): Don't close console yet.
 	(gdbtk_init): Wait until after tcl/tk stuff is all initialized
 	to close console (on Windows) and redirect ouput.
diff --git a/gdb/gdbtk/generic/gdbtk-bp.c b/gdb/gdbtk/generic/gdbtk-bp.c
index 683c7f1f648..4f65e3511b8 100644
--- a/gdb/gdbtk/generic/gdbtk-bp.c
+++ b/gdb/gdbtk/generic/gdbtk-bp.c
@@ -24,6 +24,7 @@
 #include "linespec.h"
 #include "breakpoint.h"
 #include "tracepoint.h"
+#include "gdb-events.h"
 
 #include <tcl.h>
 #include "gdbtk.h"
@@ -199,7 +200,6 @@ gdb_find_bp_at_addr (clientData, interp, objc, objv)
 {
   int i;
   long addr;
-  struct breakpoint *b;
 
   if (objc != 2)
     {
@@ -419,7 +419,6 @@ gdb_set_bp (clientData, interp, objc, objv)
   int line, thread = -1;
   struct breakpoint *b;
   char *buf, *typestr;
-  Tcl_DString cmd;
   enum bpdisp disp;
 
   if (objc != 4 && objc != 5)
@@ -505,8 +504,7 @@ gdb_set_bp_addr (ClientData clientData, Tcl_Interp *interp, int objc,
   int thread = -1;
   long addr;
   struct breakpoint *b;
-  char *filename, *typestr, *buf;
-  Tcl_DString cmd;
+  char *typestr, *buf;
   enum bpdisp disp;
 
   if (objc != 3 && objc != 4)
diff --git a/gdb/gdbtk/generic/gdbtk-hooks.c b/gdb/gdbtk/generic/gdbtk-hooks.c
index 717eda503b5..c97c42bcfd5 100644
--- a/gdb/gdbtk/generic/gdbtk-hooks.c
+++ b/gdb/gdbtk/generic/gdbtk-hooks.c
@@ -100,7 +100,6 @@ static void gdbtk_print_frame_info (struct symtab *, int, int, int);
 static void gdbtk_post_add_symbol (void);
 static void gdbtk_register_changed (int regno);
 static void gdbtk_memory_changed (CORE_ADDR addr, int len);
-static void tracepoint_notify (struct tracepoint *, const char *);
 static void gdbtk_selected_frame_changed (int);
 static void gdbtk_context_change (int);
 static void gdbtk_error_begin (void);
@@ -436,7 +435,6 @@ x_event (signo)
 {
   static volatile int in_x_event = 0;
   static Tcl_Obj *varname = NULL;
-  static int count = 0;
 
   /* Do nor re-enter this code or enter it while collecting gdb output. */
   if (in_x_event || in_fputs)
diff --git a/gdb/gdbtk/generic/gdbtk.c b/gdb/gdbtk/generic/gdbtk.c
index 1bf6825173d..50cf29186ce 100644
--- a/gdb/gdbtk/generic/gdbtk.c
+++ b/gdb/gdbtk/generic/gdbtk.c
@@ -364,11 +364,8 @@ gdbtk_init (argv0)
      char *argv0;
 {
   struct cleanup *old_chain;
-  int found_main;
   char *s;
 
-  Tcl_Obj *auto_path_elem, *auto_path_name;
-
   /* If there is no DISPLAY environment variable, Tk_Init below will fail,
      causing gdb to abort.  If instead we simply return here, gdb will
      gracefully degrade to using the command line interface. */