diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/cli/cli-cmds.c | 28 |
2 files changed, 16 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7b155d3..17db0c3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2015-12-11 Andrew Burgess <andrew.burgess@embecosm.com> + * cli/cli-cmds.c (list_command): Move all handling of +/- + arguments into a single if block. + +2015-12-11 Andrew Burgess <andrew.burgess@embecosm.com> + * cli/cli-cmds.c (list_command): Use NULL instead of 0 when checking pointers. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 841fc55..872c844 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -930,27 +930,21 @@ list_command (char *arg, int from_tty) print_source_lines (cursal.symtab, first, first + get_lines_to_list (), 0); - return; } - } - /* "l" or "l +" lists next ten lines. */ + /* "l" or "l +" lists next ten lines. */ + else if (arg == NULL || strcmp (arg, "+") == 0) + print_source_lines (cursal.symtab, cursal.line, + cursal.line + get_lines_to_list (), 0); - if (arg == NULL || strcmp (arg, "+") == 0) - { - print_source_lines (cursal.symtab, cursal.line, - cursal.line + get_lines_to_list (), 0); - return; - } + /* "l -" lists previous ten lines, the ones before the ten just + listed. */ + else if (strcmp (arg, "-") == 0) + print_source_lines (cursal.symtab, + max (get_first_line_listed () + - get_lines_to_list (), 1), + get_first_line_listed (), 0); - /* "l -" lists previous ten lines, the ones before the ten just - listed. */ - if (strcmp (arg, "-") == 0) - { - print_source_lines (cursal.symtab, - max (get_first_line_listed () - - get_lines_to_list (), 1), - get_first_line_listed (), 0); return; } |