diff options
| -rw-r--r-- | gdb/ChangeLog | 14 | ||||
| -rw-r--r-- | gdb/defs.h | 2 | ||||
| -rw-r--r-- | gdb/rdi-share/ardi.c | 4 | ||||
| -rw-r--r-- | gdb/remote-sim.c | 4 | ||||
| -rw-r--r-- | gdb/ser-tcp.c | 6 | ||||
| -rw-r--r-- | gdb/ser-unix.c | 18 | ||||
| -rw-r--r-- | gdb/serial.h | 5 | ||||
| -rw-r--r-- | gdb/top.c | 2 | ||||
| -rw-r--r-- | gdb/v850ice.c | 2 | ||||
| -rw-r--r-- | gdb/win32-nat.c | 4 | ||||
| -rw-r--r-- | gdb/wince.c | 4 |
11 files changed, 41 insertions, 24 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 22b755a7d69..f2cbaa5ee69 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2004-06-25 Andrew Cagney <cagney@gnu.org> + + * defs.h (deprecated_ui_loop_hook): Deprecated. + * wince.c (child_wait): Update. + * win32-nat.c (child_wait): Update. + * v850ice.c (v850ice_wait): Update. + * top.c (deprecated_ui_loop_hook): Update. + * serial.h: Update. + * ser-unix.c (do_hardwire_readchar, do_hardwire_readchar) + (do_unix_readchar): Update. + * ser-tcp.c (net_open): Update. + * remote-sim.c (gdb_os_poll_quit): Update. + * rdi-share/ardi.c (angel_RDI_ExecuteOrStep): Update. + 2004-06-24 Andrew Cagney <cagney@gnu.org> * defs.h (deprecated_pre_add_symbol_hook) diff --git a/gdb/defs.h b/gdb/defs.h index 9e787e2c7dd..99d64bb9c1e 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -1220,7 +1220,7 @@ extern int event_loop_p; extern void (*deprecated_pre_add_symbol_hook) (const char *); extern void (*deprecated_post_add_symbol_hook) (void); extern void (*selected_frame_level_changed_hook) (int); -extern int (*ui_loop_hook) (int signo); +extern int (*deprecated_ui_loop_hook) (int signo); extern void (*deprecated_init_ui_hook) (char *argv0); extern void (*deprecated_command_loop_hook) (void); extern void (*deprecated_show_load_progress) (const char *section, diff --git a/gdb/rdi-share/ardi.c b/gdb/rdi-share/ardi.c index 60eff0b8e03..268532cb503 100644 --- a/gdb/rdi-share/ardi.c +++ b/gdb/rdi-share/ardi.c @@ -1413,8 +1413,8 @@ static int angel_RDI_ExecuteOrStep(PointHandle *handle, word type, signal(SIGINT, ardi_sigint_handler); while( executing ) { - if (ui_loop_hook) - ui_loop_hook(0); + if (deprecated_ui_loop_hook) + deprecated_ui_loop_hook(0); if (interrupt_request || stop_request) { diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index e058311a73d..a1be90e0e3a 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -632,8 +632,8 @@ gdbsim_stop (void) static int gdb_os_poll_quit (host_callback *p) { - if (ui_loop_hook != NULL) - ui_loop_hook (0); + if (deprecated_ui_loop_hook != NULL) + deprecated_ui_loop_hook (0); if (quit_flag) /* gdb's idea of quit */ { diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c index 21d84768d9c..de8c4283744 100644 --- a/gdb/ser-tcp.c +++ b/gdb/ser-tcp.c @@ -48,7 +48,7 @@ void _initialize_ser_tcp (void); /* seconds to wait for connect */ #define TIMEOUT 15 -/* how many times per second to poll ui_loop_hook */ +/* how many times per second to poll deprecated_ui_loop_hook */ #define POLL_INTERVAL 2 /* Open a tcp socket */ @@ -132,9 +132,9 @@ net_open (struct serial *scb, const char *name) /* While we wait for the connect to complete poll the UI so it can update or the user can interrupt. */ - if (ui_loop_hook) + if (deprecated_ui_loop_hook) { - if (ui_loop_hook (0)) + if (deprecated_ui_loop_hook (0)) { errno = EINTR; net_close (scb); diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c index 4b48f409a9c..6f64f419b33 100644 --- a/gdb/ser-unix.c +++ b/gdb/ser-unix.c @@ -578,11 +578,12 @@ do_hardwire_readchar (struct serial *scb, int timeout) /* N.B. The UI may destroy our world (for instance by calling remote_stop,) in which case we want to get out of here as quickly as possible. It is not safe to touch scb, since - someone else might have freed it. The ui_loop_hook signals that - we should exit by returning 1. */ + someone else might have freed it. The + deprecated_ui_loop_hook signals that we should exit by + returning 1. */ - if (ui_loop_hook) - detach = ui_loop_hook (0); + if (deprecated_ui_loop_hook) + detach = deprecated_ui_loop_hook (0); if (detach) return SERIAL_TIMEOUT; @@ -957,12 +958,13 @@ do_unix_readchar (struct serial *scb, int timeout) /* N.B. The UI may destroy our world (for instance by calling remote_stop,) in which case we want to get out of here as quickly as possible. It is not safe to touch scb, since - someone else might have freed it. The ui_loop_hook signals that - we should exit by returning 1. */ + someone else might have freed it. The + deprecated_ui_loop_hook signals that we should exit by + returning 1. */ - if (ui_loop_hook) + if (deprecated_ui_loop_hook) { - if (ui_loop_hook (0)) + if (deprecated_ui_loop_hook (0)) return SERIAL_TIMEOUT; } diff --git a/gdb/serial.h b/gdb/serial.h index 7495b709d57..abe76b00679 100644 --- a/gdb/serial.h +++ b/gdb/serial.h @@ -62,8 +62,9 @@ extern void serial_un_fdopen (struct serial *scb); enum serial_rc { SERIAL_ERROR = -1, /* General error. */ SERIAL_TIMEOUT = -2, /* Timeout or data-not-ready during read. - Unfortunately, through ui_loop_hook(), this - can also be a QUIT indication. */ + Unfortunately, through + deprecated_ui_loop_hook(), this can also be + a QUIT indication. */ SERIAL_EOF = -3 /* General end-of-file or remote target connection closed, indication. Includes things like the line dropping dead. */ diff --git a/gdb/top.c b/gdb/top.c index f68d618631e..98e50100228 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -199,7 +199,7 @@ void (*deprecated_init_ui_hook) (char *argv0); steal control from a real user interface's event loop. It returns non-zero if the user is requesting a detach, zero otherwise. */ -int (*ui_loop_hook) (int); +int (*deprecated_ui_loop_hook) (int); /* Called instead of command_loop at top level. Can be invoked via throw_exception(). */ diff --git a/gdb/v850ice.c b/gdb/v850ice.c index c36e7564e2e..44a8f1d8450 100644 --- a/gdb/v850ice.c +++ b/gdb/v850ice.c @@ -441,7 +441,7 @@ v850ice_wait (ptid_t ptid, struct target_waitstatus *status) { if (count++ % 100000) { - ui_loop_hook (0); + deprecated_ui_loop_hook (0); count = 0; } diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 1d89f4af765..b8e5380715d 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -1417,8 +1417,8 @@ child_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { int detach = 0; - if (ui_loop_hook != NULL) - detach = ui_loop_hook (0); + if (deprecated_ui_loop_hook != NULL) + detach = deprecated_ui_loop_hook (0); if (detach) child_kill_inferior (); diff --git a/gdb/wince.c b/gdb/wince.c index 1b883d6dc6e..02df7a6b025 100644 --- a/gdb/wince.c +++ b/gdb/wince.c @@ -1507,8 +1507,8 @@ child_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { int detach = 0; - if (ui_loop_hook != NULL) - detach = ui_loop_hook (0); + if (deprecated_ui_loop_hook != NULL) + detach = deprecated_ui_loop_hook (0); if (detach) child_kill_inferior (); |