diff options
| -rw-r--r-- | gdb/ChangeLog | 14 | ||||
| -rw-r--r-- | gdb/event-top.c | 16 | ||||
| -rw-r--r-- | gdb/main.c | 4 | ||||
| -rw-r--r-- | gdb/top.c | 25 | ||||
| -rw-r--r-- | gdb/top.h | 4 |
5 files changed, 38 insertions, 25 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 134012c..25f39a1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2011-06-13 Pedro Alves <pedro@codesourcery.com> + + * top.h (line): Rename to ... + (saved_command_line): ... this. + (linesize): Rename to ... + (saved_command_line_size): ... this. + * top.c (line): Rename to ... + (saved_command_line): ... this. + (linesize): Rename to ... + (saved_command_line_size): ... this. + (dont_repeat, command_line_input, dont_repeat_command): Adjust. + * event-top.c (command_line_handler): Adjust. + * main.c (captured_main): Adjust. + 2011-06-12 Mark Kettenis <kettenis@gnu.org> * i386-tdep.c (i386_epilogue_frame_cache): Simplify code. Call diff --git a/gdb/event-top.c b/gdb/event-top.c index a8a3e0f..72cbfdc 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -520,8 +520,6 @@ command_line_handler (char *rl) static unsigned linelength = 0; char *p; char *p1; - extern char *line; - extern int linesize; char *nline; char got_eof = 0; @@ -661,7 +659,7 @@ command_line_handler (char *rl) previous command, return the value in the global buffer. */ if (repeat && p == linebuffer && *p != '\\') { - command_handler (line); + command_handler (saved_command_line); display_gdb_prompt (0); return; } @@ -669,7 +667,7 @@ command_line_handler (char *rl) for (p1 = linebuffer; *p1 == ' ' || *p1 == '\t'; p1++); if (repeat && !*p1) { - command_handler (line); + command_handler (saved_command_line); display_gdb_prompt (0); return; } @@ -693,15 +691,15 @@ command_line_handler (char *rl) /* Save into global buffer if appropriate. */ if (repeat) { - if (linelength > linesize) + if (linelength > saved_command_line_size) { - line = xrealloc (line, linelength); - linesize = linelength; + saved_command_line = xrealloc (saved_command_line, linelength); + saved_command_line_size = linelength; } - strcpy (line, linebuffer); + strcpy (saved_command_line, linebuffer); if (!more_to_come) { - command_handler (line); + command_handler (saved_command_line); display_gdb_prompt (0); } return; @@ -319,8 +319,8 @@ captured_main (void *data) ndir = 0; quit_flag = 0; - line = (char *) xmalloc (linesize); - line[0] = '\0'; /* Terminate saved (now empty) cmd line. */ + saved_command_line = (char *) xmalloc (saved_command_line_size); + saved_command_line[0] = '\0'; instream = stdin; gdb_stdout = stdio_fileopen (stdout); @@ -137,8 +137,8 @@ int xgdb_verbose; /* Buffer used for reading command lines, and the size allocated for it so far. */ -char *line; -int linesize = 100; +char *saved_command_line; +int saved_command_line_size = 100; /* Nonzero if the current command is modified by "server ". This affects things like recording into the command history, commands @@ -572,7 +572,7 @@ dont_repeat (void) thing read from stdin in line and don't want to delete it. Null lines won't repeat here in any case. */ if (instream == stdin) - *line = 0; + *saved_command_line = 0; } /* Prevent dont_repeat from working, and return a cleanup that @@ -1034,10 +1034,10 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix) /* If we just got an empty line, and that is supposed to repeat the previous command, return the value in the global buffer. */ if (repeat && p == linebuffer) - return line; + return saved_command_line; for (p1 = linebuffer; *p1 == ' ' || *p1 == '\t'; p1++); if (repeat && !*p1) - return line; + return saved_command_line; *p = 0; @@ -1058,13 +1058,13 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix) /* Save into global buffer if appropriate. */ if (repeat) { - if (linelength > linesize) + if (linelength > saved_command_line_size) { - line = xrealloc (line, linelength); - linesize = linelength; + saved_command_line = xrealloc (saved_command_line, linelength); + saved_command_line_size = linelength; } - strcpy (line, linebuffer); - return line; + strcpy (saved_command_line, linebuffer); + return saved_command_line; } return linebuffer; @@ -1314,8 +1314,9 @@ input_from_terminal_p (void) static void dont_repeat_command (char *ignored, int from_tty) { - *line = 0; /* Can't call dont_repeat here because we're - not necessarily reading from stdin. */ + /* Can't call dont_repeat here because we're not necessarily reading + from stdin. */ + *saved_command_line = 0; } /* Functions to manipulate command line editing control variables. */ @@ -23,8 +23,8 @@ #define TOP_H /* From top.c. */ -extern char *line; -extern int linesize; +extern char *saved_command_line; +extern int saved_command_line_size; extern FILE *instream; extern int in_user_command; extern int caution; |