Removed superflous code.

[deliverable/binutils-gdb.git] / gdb / gdbtk.c

diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index ba72e0a0d986086141fafdea5f288eb1325948f5..d1760a62b7217783c9f6fb5dd3a1821cfe864f0a 100644 (file)
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -81,12 +81,12 @@ static struct itimerval it_on, it_off;
 
 extern int Tktable_Init PARAMS ((Tcl_Interp *interp)); 
 
-static void null_routine PARAMS ((int));
 static void gdbtk_init PARAMS ((char *));
 void gdbtk_interactive PARAMS ((void));
 static void cleanup_init PARAMS ((int));
 static void tk_command PARAMS ((char *, int));
 
+void gdbtk_add_hooks PARAMS ((void));
 int gdbtk_test PARAMS ((char *));
 
 /*
@@ -102,21 +102,21 @@ Tcl_Interp *gdbtk_interp = NULL;
 
 static int gdbtk_timer_going = 0;
 
+/* linked variable used to tell tcl what the current thread is */
+int gdb_context = 0;
+
 /* This variable is true when the inferior is running.  See note in
  * gdbtk.h for details.
  */
-
 int running_now;
 
 /* This variable determines where memory used for disassembly is read from.
  * See note in gdbtk.h for details.
  */
-
 int disassemble_from_exec = -1;
 
 /* This variable holds the name of a Tcl file which should be sourced by the
    interpreter when it goes idle at startup. Used with the testsuite. */
-
 static char *gdbtk_source_filename = NULL;
 \f
 #ifndef _WIN32
@@ -149,12 +149,6 @@ Tcl_Free(ptr)
 
 #endif /* ! _WIN32 */
 
-static void
-null_routine(arg)
-     int arg;
-{
-}
-
 #ifdef _WIN32
 
 /* On Windows, if we hold a file open, other programs can't write to
@@ -296,55 +290,6 @@ gdbtk_stop_timer ()
     }
 }
 
-/* This is called from execute_command, and provides a wrapper around
-   various command routines in a place where both protocol messages and
-   user input both flow through.  Mostly this is used for indicating whether
-   the target process is running or not.
-*/
-
-static void
-gdbtk_call_command (cmdblk, arg, from_tty)
-     struct cmd_list_element *cmdblk;
-     char *arg;
-     int from_tty;
-{
-  running_now = 0;
-  if (cmdblk->class == class_run || cmdblk->class == class_trace)
-    {
-
-/* HACK! HACK! This is to get the gui to update the tstart/tstop
-   button only incase of tstart/tstop commands issued from the console
-   We don't want to update the src window, so we need to have specific
-   procedures to do tstart and tstop
-   Unfortunately this will not display errors from tstart or tstop in the 
-   console window itself, but as dialogs.*/
-
-      if (!strcmp(cmdblk->name, "tstart") && !No_Update)
-        {
-              Tcl_Eval (gdbtk_interp, "gdbtk_tcl_tstart"); 
-              (*cmdblk->function.cfunc)(arg, from_tty);
-        }
-      else if (!strcmp(cmdblk->name, "tstop") && !No_Update) 
-             {
-              Tcl_Eval (gdbtk_interp, "gdbtk_tcl_tstop"); 
-              (*cmdblk->function.cfunc)(arg, from_tty);
-             }
-/* end of hack */
-           else 
-             {
-                 running_now = 1;
-                 if (!No_Update)
-                   Tcl_Eval (gdbtk_interp, "gdbtk_tcl_busy");
-                 (*cmdblk->function.cfunc)(arg, from_tty);
-                 running_now = 0;
-                 if (!No_Update)
-                   Tcl_Eval (gdbtk_interp, "gdbtk_tcl_idle");
-             }
-    }
-  else
-    (*cmdblk->function.cfunc)(arg, from_tty);
-}
-
 /* gdbtk_init installs this function as a final cleanup.  */
 
 static void
@@ -353,8 +298,10 @@ gdbtk_cleanup (dummy)
 {
   Tcl_Eval (gdbtk_interp, "gdbtk_cleanup");
 #ifdef IDE
-  struct ide_event_handle *h = (struct ide_event_handle *) dummy;
-  ide_interface_deregister_all (h);
+  {
+    struct ide_event_handle *h = (struct ide_event_handle *) dummy;
+    ide_interface_deregister_all (h);
+  }
 #endif
   Tcl_Finalize ();
 }
@@ -372,12 +319,9 @@ gdbtk_init ( argv0 )
 {
   struct cleanup *old_chain;
   char *lib, *gdbtk_lib, *gdbtk_lib_tmp, *gdbtk_file;
-  int i, found_main;
+  int found_main;
   Tcl_Obj *auto_path_elem, *auto_path_name;
-#ifndef WINNT
-  struct sigaction action;
-  static sigset_t nullsigmask = {0};
-#endif
+
 #ifdef IDE
   /* start-sanitize-ide */
   struct ide_event_handle *h;
@@ -395,7 +339,7 @@ gdbtk_init ( argv0 )
     return;
 #endif
 
-  old_chain = make_cleanup (cleanup_init, 0);
+  old_chain = make_cleanup ((make_cleanup_func) cleanup_init, 0);
 
   /* First init tcl and tk. */
   Tcl_FindExecutable (argv0); 
@@ -554,11 +498,13 @@ gdbtk_init ( argv0 )
 
   gdbtk_lib = getenv ("GDBTK_LIBRARY");
   if (!gdbtk_lib)
-    if (access ("gdbtcl/main.tcl", R_OK) == 0)
-      gdbtk_lib = "gdbtcl";
-    else
-      gdbtk_lib = GDBTK_LIBRARY;
-
+    {
+      if (access ("gdbtcl/main.tcl", R_OK) == 0)
+       gdbtk_lib = "gdbtcl";
+      else
+       gdbtk_lib = GDBTK_LIBRARY;
+    }
+  
   gdbtk_lib_tmp = xstrdup (gdbtk_lib);
 
   found_main = 0;