diff options
| -rw-r--r-- | gdb/ChangeLog | 13 | ||||
| -rw-r--r-- | gdb/cli/cli-script.c | 30 | ||||
| -rw-r--r-- | gdb/event-top.c | 15 | ||||
| -rw-r--r-- | gdb/top.c | 27 | ||||
| -rw-r--r-- | gdb/top.h | 7 |
5 files changed, 25 insertions, 67 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ee8012ca8d..41223e961b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2005-01-17 Andrew Cagney <cagney@gnu.org> + + * top.h (source_error, source_pre_error): Delete declaration. + * cli/cli-script.c (source_error_allocated, source_error): Delete. + (script_from_file, source_cleanup_lines): Do not manipulate + source_error_allocated, error_pre_print and source_error. + (struct source_cleanup_lines_args): Delete fields old_pre_error, + and old_error_pre_print. + * top.c (source_error_allocated, source_error) + (source_pre_error): Delete. + (command_line_input): Do not set error_pre_print. + * event-top.c (command_line_handler): Do not set error_pre_print. + 2005-01-16 Jason Thorpe <thorpej@netbsd.org> * MAINTAINERS: Update my email address. diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index 2bac862e72..458559ae17 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -48,9 +48,6 @@ static void validate_comname (char *); /* Level of control structure. */ static int control_level; -/* Source command state variable. */ -static int source_error_allocated; - /* Structure for arguments to user defined functions. */ #define MAXUSERARGS 10 struct user_args @@ -1230,8 +1227,6 @@ struct source_cleanup_lines_args { int old_line; char *old_file; - char *old_pre_error; - char *old_error_pre_print; }; static void @@ -1241,8 +1236,6 @@ source_cleanup_lines (void *args) (struct source_cleanup_lines_args *) args; source_line_number = p->old_line; source_file_name = p->old_file; - source_pre_error = p->old_pre_error; - error_pre_print = p->old_error_pre_print; } static void @@ -1281,30 +1274,13 @@ script_from_file (FILE *stream, char *file) old_lines.old_line = source_line_number; old_lines.old_file = source_file_name; - old_lines.old_pre_error = source_pre_error; - old_lines.old_error_pre_print = error_pre_print; make_cleanup (source_cleanup_lines, &old_lines); source_line_number = 0; source_file_name = file; - source_pre_error = error_pre_print == NULL ? "" : error_pre_print; - source_pre_error = savestring (source_pre_error, strlen (source_pre_error)); - make_cleanup (xfree, source_pre_error); /* This will get set every time we read a line. So it won't stay "" for long. */ error_pre_print = ""; - needed_length = strlen (source_file_name) + strlen (source_pre_error) + 80; - if (source_error_allocated < needed_length) - { - source_error_allocated *= 2; - if (source_error_allocated < needed_length) - source_error_allocated = needed_length; - if (source_error == NULL) - source_error = xmalloc (source_error_allocated); - else - source_error = xrealloc (source_error, source_error_allocated); - } - { struct exception e; struct wrapped_read_command_file_args args; @@ -1318,10 +1294,8 @@ script_from_file (FILE *stream, char *file) case RETURN_ERROR: /* Re-throw the error, but with the file name information prepended. */ - throw_error (e.error, "%s%s:%d: Error in sourced command file:\n%s", - source_pre_error, source_file_name, - source_line_number, - e.message); + throw_error (e.error, "%s:%d: Error in sourced command file:\n%s", + source_file_name, source_line_number, e.message); default: internal_error (__FILE__, __LINE__, "bad reason"); } diff --git a/gdb/event-top.c b/gdb/event-top.c index 5f7df47ed8..1d961c2851 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -1,5 +1,8 @@ /* Top level stuff for GDB, the GNU debugger. - Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. + + Copyright 1999, 2000, 2001, 2002, 2004, 2005 Free Software + Foundation, Inc. + Written by Elena Zannoni <ezannoni@cygnus.com> of Cygnus Solutions. This file is part of GDB. @@ -646,15 +649,7 @@ command_line_handler (char *rl) gdb_flush (gdb_stderr); if (source_file_name != NULL) - { - ++source_line_number; - sprintf (source_error, - "%s%s:%d: Error in sourced command file:\n", - source_pre_error, - source_file_name, - source_line_number); - error_pre_print = source_error; - } + ++source_line_number; /* If we are in this case, then command_handler will call quit and exit from gdb. */ @@ -1,7 +1,7 @@ /* Top level stuff for GDB, the GNU debugger. Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GDB. @@ -319,21 +319,6 @@ quit_cover (void *s) event-top.c into this file, top.c */ /* static */ char *source_file_name; -/* Buffer containing the error_pre_print used by the source stuff. - Malloc'd. */ -/* NOTE 1999-04-29: This variable 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 */ char *source_error; -static int source_error_allocated; - -/* Something to glom on to the start of error_pre_print if source_file_name - is set. */ -/* NOTE 1999-04-29: This variable 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 */ char *source_pre_error; - /* Clean up on error during a "source" command (or execution of a user-defined command). */ @@ -873,15 +858,7 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix) gdb_flush (gdb_stderr); if (source_file_name != NULL) - { - ++source_line_number; - sprintf (source_error, - "%s%s:%d: Error in sourced command file:\n", - source_pre_error, - source_file_name, - source_line_number); - error_pre_print = source_error; - } + ++source_line_number; if (annotation_level > 1 && instream == stdin) { @@ -1,6 +1,7 @@ /* Top level stuff for GDB, the GNU debugger. - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, - 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + + Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, + 1996, 1997, 1998, 1999, 2000, 2005 Free Software Foundation, Inc. This file is part of GDB. @@ -65,8 +66,6 @@ extern void gdb_init (char *); /* Variables from top.c. */ extern int source_line_number; extern char *source_file_name; -extern char *source_error; -extern char *source_pre_error; extern int history_expansion_p; extern int server_command; extern char *lim_at_start; |
