[PATCH v3 1/4] gdb/cli: Factor out code to list lines for the first time

Bruno Larsen via Gdb-patches
2023-06-21T10:46:25Z

A future patch will add more situations that calculates "lines around a
certain point" to be printed using print_source_lines, and the logic
could be re-used. As a preparation for those commits, this one factors
out that part of the logic of the list command into its own function.
No functional changes are expected
---
gdb/cli/cli-cmds.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 638c138e7cb..b0b9c08c2ec 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1200,6 +1200,26 @@ pipe_command_completer (struct cmd_list_element *ignore,
we don't know how to complete. */
}

+/* Helper for the list_command function. Resets the location to be printed
+ to the line where the inferior is stopped, then prints the lines. */
+static void
+list_around_line (const char *arg, symtab_and_line cursal)
+{
+ int first;
+
+ first = std::max (cursal.line - get_lines_to_list () / 2, 1);
+
+ /* A small special case --- if listing backwards, and we
+ should list only one line, list the preceding line,
+ instead of the exact line we've just shown after e.g.,
+ stopping for a breakpoint. */
+ if (arg != NULL && arg[0] == '-'
+ && get_lines_to_list () == 1 && first > 1)
+ first -= 1;
+
+ print_source_lines (cursal.symtab, source_lines_range (first), 0);
+}
+
static void
list_command (const char *arg, int from_tty)
{
@@ -1221,19 +1241,7 @@ list_command (const char *arg, int from_tty)
source line, center the listing around that line. */
if (get_first_line_listed () == 0)
{
- int first;
-
- first = std::max (cursal.line - get_lines_to_list () / 2, 1);
-
- /* A small special case --- if listing backwards, and we
- should list only one line, list the preceding line,
- instead of the exact line we've just shown after e.g.,
- stopping for a breakpoint. */
- if (arg != NULL && arg[0] == '-'
- && get_lines_to_list () == 1 && first > 1)
- first -= 1;
-
- print_source_lines (cursal.symtab, source_lines_range (first), 0);
+ list_around_line (arg, cursal);
}

/* "l" or "l +" lists next ten lines. */
--
2.40.1