diff options
| author | Markus Metzger <mmetzger@sourceware.org> | 2012-11-13 15:19:56 +0000 |
|---|---|---|
| committer | Markus Metzger <mmetzger@sourceware.org> | 2012-11-13 15:19:56 +0000 |
| commit | dfaae88645ac58515a3037a09df0d1b7b6d034a4 (patch) | |
| tree | f5a25fa722d0445676f36acfe892fa6af848b4a1 | |
| parent | 3ba6ad0f876ad790def1eaa57397c1cf2235cfc7 (diff) | |
| download | gdb-dfaae88645ac58515a3037a09df0d1b7b6d034a4.zip gdb-dfaae88645ac58515a3037a09df0d1b7b6d034a4.tar.gz gdb-dfaae88645ac58515a3037a09df0d1b7b6d034a4.tar.bz2 | |
* symtab.h (print_source_lines_flags): New enum.
* source.c (print_source_lines_base): Change noerror to flags.
(print_source_lines): Change noerror to flags.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/source.c | 16 | ||||
| -rw-r--r-- | gdb/symtab.h | 11 |
3 files changed, 24 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c988862..498b6a7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2012-11-13 Markus Metzger <markus.t.metzger@intel.com> + + * symtab.h (print_source_lines_flags): New enum. + * source.c (print_source_lines_base): Change noerror to flags. + (print_source_lines): Change noerror to flags. + 2012-11-13 Pierre Muller <muller@sourceware.org> ARI fixes: Avoid sprintf function use rule. diff --git a/gdb/source.c b/gdb/source.c index c05822e..2fe2e50 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1245,10 +1245,9 @@ identify_source_line (struct symtab *s, int line, int mid_statement, /* Print source lines from the file of symtab S, starting with line number LINE and stopping before line number STOPLINE. */ -static void print_source_lines_base (struct symtab *s, int line, int stopline, - int noerror); static void -print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) +print_source_lines_base (struct symtab *s, int line, int stopline, + enum print_source_lines_flags flags) { int c; int desc; @@ -1276,13 +1275,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) else { desc = last_source_error; - noerror = 1; + flags |= PRINT_SOURCE_LINES_NOERROR; } } else { desc = last_source_error; - noerror = 1; + flags |= PRINT_SOURCE_LINES_NOERROR; noprint = 1; } @@ -1290,7 +1289,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) { last_source_error = desc; - if (!noerror) + if (!(flags & PRINT_SOURCE_LINES_NOERROR)) { int len = strlen (s->filename) + 100; char *name = alloca (len); @@ -1385,9 +1384,10 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror) window otherwise it is simply printed. */ void -print_source_lines (struct symtab *s, int line, int stopline, int noerror) +print_source_lines (struct symtab *s, int line, int stopline, + enum print_source_lines_flags flags) { - print_source_lines_base (s, line, stopline, noerror); + print_source_lines_base (s, line, stopline, flags); } /* Print info on range of pc's in a specified line. */ diff --git a/gdb/symtab.h b/gdb/symtab.h index b74fbe4..3b87c96 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1162,7 +1162,16 @@ extern void clear_solib (void); extern int identify_source_line (struct symtab *, int, int, CORE_ADDR); -extern void print_source_lines (struct symtab *, int, int, int); +/* Flags passed as 4th argument to print_source_lines. */ + +enum print_source_lines_flags + { + /* Do not print an error message. */ + PRINT_SOURCE_LINES_NOERROR = (1 << 0) + }; + +extern void print_source_lines (struct symtab *, int, int, + enum print_source_lines_flags); extern void forget_cached_source_info_for_objfile (struct objfile *); extern void forget_cached_source_info (void); |