From e2273c6d9d77703f6795c9a6337e33f604f1436c Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Wed, 5 Jul 2000 10:36:41 +0000
Subject: [PATCH] Replace command_loop_marker() with null_cleanup().

---
 gdb/ChangeLog   |  7 +++++++
 gdb/event-top.c |  2 +-
 gdb/top.c       | 18 ++----------------
 gdb/top.h       |  1 -
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3669af2ef22..0d7c2e0cd89 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul  5 20:28:32 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* top.h (command_loop_marker), top.c (command_loop_marker):
+ 	Delete.
+	* event-top.c (command_handler), top.c (simplified_command_loop,
+ 	command_loop): Use null_cleanup instead of command_loop_marker.
+
 Wed Jul  5 20:09:41 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* event-loop.c: Include either <poll.h> or <sys/poll.h>.
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 34bf5dffc8c..deb7df67048 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -487,7 +487,7 @@ command_handler (char *command)
   quit_flag = 0;
   if (instream == stdin && stdin_is_tty)
     reinitialize_more_filter ();
-  old_chain = make_cleanup (command_loop_marker, 0);
+  old_chain = make_cleanup (null_cleanup, 0);
 
 #if defined(TUI)
   insert_mode = 0;
diff --git a/gdb/top.c b/gdb/top.c
index 3bc55f9ab3e..cdf292d6f2b 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -73,11 +73,6 @@ static char *line_completion_function (char *, int, char *, int);
 
 static char *readline_line_completion_function (char *, int);
 
-/* NOTE 1999-04-29: this function will be static again, after we make the
-   event loop be the default command loop for gdb, and we merge
-   event-top.c into this file, top.c */
-/* static */ void command_loop_marker (void *);
-
 static void while_command (char *, int);
 
 static void if_command (char *, int);
@@ -1581,15 +1576,6 @@ extern void serial_log_command (const char *);
     }
 }
 
-/* ARGSUSED */
-/* NOTE 1999-04-29: This function will be static again, once we modify
-   gdb to use the event loop as the default command loop and we merge
-   event-top.c into this file, top.c */
-/* static */ void
-command_loop_marker (void *foo)
-{
-}
-
 /* Read commands from `instream' and execute them
    until end of file or error reading instream.  */
 
@@ -1617,7 +1603,7 @@ command_loop ()
       quit_flag = 0;
       if (instream == stdin && stdin_is_tty)
 	reinitialize_more_filter ();
-      old_chain = make_cleanup (command_loop_marker, 0);
+      old_chain = make_cleanup (null_cleanup, 0);
 
 #if defined(TUI)
       /* A bit of paranoia: I want to make sure the "insert_mode" global
@@ -1698,7 +1684,7 @@ simplified_command_loop (read_input_func, execute_command_func)
       quit_flag = 0;
       if (instream == stdin && stdin_is_tty)
 	reinitialize_more_filter ();
-      old_chain = make_cleanup (command_loop_marker, 0);
+      old_chain = make_cleanup (null_cleanup, 0);
 
       /* Get a command-line. */
       command = (*read_input_func) (instream == stdin ?
diff --git a/gdb/top.h b/gdb/top.h
index d5c601151a8..eee63d13f6d 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -40,7 +40,6 @@ extern void simplified_command_loop (char *(*read_input_func) (char *),
 extern int quit_confirm (void);
 extern void quit_force (char *, int);
 extern void quit_command (char *, int);
-extern void command_loop_marker (void *);
 extern int quit_cover (PTR);
 extern void execute_command (char *, int);