2004-06-25 Andrew Cagney * 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. Index: defs.h =================================================================== RCS file: /cvs/src/src/gdb/defs.h,v retrieving revision 1.149 diff -p -u -r1.149 defs.h --- defs.h 24 Jun 2004 22:09:34 -0000 1.149 +++ defs.h 25 Jun 2004 19:45:17 -0000 @@ -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, Index: remote-sim.c =================================================================== RCS file: /cvs/src/src/gdb/remote-sim.c,v retrieving revision 1.38 diff -p -u -r1.38 remote-sim.c --- remote-sim.c 24 Jun 2004 21:51:49 -0000 1.38 +++ remote-sim.c 25 Jun 2004 19:45:17 -0000 @@ -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 */ { Index: ser-tcp.c =================================================================== RCS file: /cvs/src/src/gdb/ser-tcp.c,v retrieving revision 1.14 diff -p -u -r1.14 ser-tcp.c --- ser-tcp.c 24 Jun 2004 21:51:49 -0000 1.14 +++ ser-tcp.c 25 Jun 2004 19:45:17 -0000 @@ -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 /* 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); Index: ser-unix.c =================================================================== RCS file: /cvs/src/src/gdb/ser-unix.c,v retrieving revision 1.19 diff -p -u -r1.19 ser-unix.c --- ser-unix.c 24 Jun 2004 21:51:49 -0000 1.19 +++ ser-unix.c 25 Jun 2004 19:45:18 -0000 @@ -578,11 +578,12 @@ do_hardwire_readchar (struct serial *scb /* 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, in /* 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; } Index: serial.h =================================================================== RCS file: /cvs/src/src/gdb/serial.h,v retrieving revision 1.8 diff -p -u -r1.8 serial.h --- serial.h 12 Apr 2003 17:41:25 -0000 1.8 +++ serial.h 25 Jun 2004 19:45:18 -0000 @@ -62,8 +62,9 @@ extern void serial_un_fdopen (struct ser 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. */ Index: top.c =================================================================== RCS file: /cvs/src/src/gdb/top.c,v retrieving revision 1.89 diff -p -u -r1.89 top.c --- top.c 21 Apr 2004 23:52:21 -0000 1.89 +++ top.c 25 Jun 2004 19:45:18 -0000 @@ -199,7 +199,7 @@ void (*deprecated_init_ui_hook) (char *a 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(). */ Index: v850ice.c =================================================================== RCS file: /cvs/src/src/gdb/v850ice.c,v retrieving revision 1.19 diff -p -u -r1.19 v850ice.c --- v850ice.c 24 Jun 2004 21:51:49 -0000 1.19 +++ v850ice.c 25 Jun 2004 19:45:18 -0000 @@ -441,7 +441,7 @@ v850ice_wait (ptid_t ptid, struct target { if (count++ % 100000) { - ui_loop_hook (0); + deprecated_ui_loop_hook (0); count = 0; } Index: win32-nat.c =================================================================== RCS file: /cvs/src/src/gdb/win32-nat.c,v retrieving revision 1.91 diff -p -u -r1.91 win32-nat.c --- win32-nat.c 24 Jun 2004 21:51:49 -0000 1.91 +++ win32-nat.c 25 Jun 2004 19:45:18 -0000 @@ -1417,8 +1417,8 @@ child_wait (ptid_t ptid, struct target_w { 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 (); Index: wince.c =================================================================== RCS file: /cvs/src/src/gdb/wince.c,v retrieving revision 1.28 diff -p -u -r1.28 wince.c --- wince.c 24 Jun 2004 21:51:49 -0000 1.28 +++ wince.c 25 Jun 2004 19:45:18 -0000 @@ -1507,8 +1507,8 @@ child_wait (ptid_t ptid, struct target_w { 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 (); Index: rdi-share/ardi.c =================================================================== RCS file: /cvs/src/src/gdb/rdi-share/ardi.c,v retrieving revision 1.4 diff -p -u -r1.4 ardi.c --- rdi-share/ardi.c 24 Jun 2004 21:51:49 -0000 1.4 +++ rdi-share/ardi.c 25 Jun 2004 19:45:18 -0000 @@ -1413,8 +1413,8 @@ static int angel_RDI_ExecuteOrStep(Point 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) {