diff options
author | Doug Evans <dje@google.com> | 2010-05-25 15:48:44 +0000 |
---|---|---|
committer | Doug Evans <dje@google.com> | 2010-05-25 15:48:44 +0000 |
commit | 01f69b386b461447a7135401002856d67103418d (patch) | |
tree | 9958f1b1c885410f684c8380339ce73a85b2b533 | |
parent | d19e70fbfa8a3f5bbf8f0447f740fcbc0bd9ce23 (diff) | |
download | gdb-01f69b386b461447a7135401002856d67103418d.zip gdb-01f69b386b461447a7135401002856d67103418d.tar.gz gdb-01f69b386b461447a7135401002856d67103418d.tar.bz2 |
* event-loop.h (GDB_READABLE, GDB_WRITABLE, GDB_EXCEPTION): Move to ...
* event-loop.c: ... here.
* tui/tui-io.c (tui_readline_output): Rename parameter `code' to
`error' for clarity.
(tui_getc): Pass correct value for `error' parameter to
tui_readline_output.
-rw-r--r-- | gdb/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/event-loop.c | 7 | ||||
-rw-r--r-- | gdb/event-loop.h | 7 | ||||
-rw-r--r-- | gdb/tui/tui-io.c | 4 |
4 files changed, 16 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 23ae0eb..8dac10a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2010-05-25 Doug Evans <dje@google.com> + * event-loop.h (GDB_READABLE, GDB_WRITABLE, GDB_EXCEPTION): Move to ... + * event-loop.c: ... here. + * tui/tui-io.c (tui_readline_output): Rename parameter `code' to + `error' for clarity. + (tui_getc): Pass correct value for `error' parameter to + tui_readline_output. + Add python gdb.GdbError and gdb.string_to_argv. * NEWS: Document them. * python/py-cmd.c (cmdpy_function): Don't print a traceback if diff --git a/gdb/event-loop.c b/gdb/event-loop.c index f1eba52..e8cba5d 100644 --- a/gdb/event-loop.c +++ b/gdb/event-loop.c @@ -38,6 +38,13 @@ #include "gdb_assert.h" #include "gdb_select.h" +/* Tell create_file_handler what events we are interested in. + This is used by the select version of the event loop. */ + +#define GDB_READABLE (1<<1) +#define GDB_WRITABLE (1<<2) +#define GDB_EXCEPTION (1<<3) + /* Data point to pass to the event handler. */ typedef union event_data { diff --git a/gdb/event-loop.h b/gdb/event-loop.h index bdf13e0..9a61d91 100644 --- a/gdb/event-loop.h +++ b/gdb/event-loop.h @@ -88,13 +88,6 @@ typedef enum } queue_position; -/* Tell create_file_handler what events we are interested in. - This is used by the select version of the event loop. */ - -#define GDB_READABLE (1<<1) -#define GDB_WRITABLE (1<<2) -#define GDB_EXCEPTION (1<<3) - /* Exported functions from event-loop.c */ extern void start_event_loop (void); diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index ad455fa..4370a7e 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -303,7 +303,7 @@ tui_deprep_terminal (void) /* Read readline output pipe and feed the command window with it. Should be removed when readline is clean. */ static void -tui_readline_output (int code, gdb_client_data data) +tui_readline_output (int error, gdb_client_data data) { int size; char buf[256]; @@ -657,7 +657,7 @@ tui_getc (FILE *fp) #ifdef TUI_USE_PIPE_FOR_READLINE /* Flush readline output. */ - tui_readline_output (GDB_READABLE, 0); + tui_readline_output (0, 0); #endif ch = wgetch (w); |