gdb: minor code cleanups in list_command

There should be no functional change after this commit, this is mostly
just a code cleanup in the list_command function.

I have inlined local variables into the function body, changing 'int'
to 'bool' where appropriate, and updating 'if' conditions to avoid
treating non-bools as a bool.

I also make more use of list_around_line towards the end of the
list_command function, which avoids some code duplication, but
shouldn't be a functional change.

Reviewed-By: Keith Seitz <keiths@redhat.com>

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index eda48ae807142d64841bf5f599a5aa78a5d28ca2..8b8f928e1a2707d2e7ef914604f4a7edd65e0c0c 100644 (file)
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1250,14 +1250,6 @@ list_around_line (const char *arg, symtab_and_line cursal)
 static void
 list_command (const char *arg, int from_tty)
 {
-  struct symbol *sym;
-  const char *arg1;
-  int no_end = 1;
-  int dummy_end = 0;
-  int dummy_beg = 0;
-  int linenum_beg = 0;
-  const char *p;
-
   /* Pull in the current default source line if necessary.  */
   if (arg == NULL || ((arg[0] == '+' || arg[0] == '-' || arg[0] == '.') && arg[1] == '\0'))
     {
@@ -1363,10 +1355,11 @@ list_command (const char *arg, int from_tty)
 
   std::vector<symtab_and_line> sals;
   symtab_and_line sal, sal_end;
+  bool dummy_beg = false;
 
-  arg1 = arg;
+  const char *arg1 = arg;
   if (*arg1 == ',')
-    dummy_beg = 1;
+    dummy_beg = true;
   else
     {
       location_spec_up locspec
@@ -1394,18 +1387,21 @@ list_command (const char *arg, int from_tty)
 
   /* Record whether the BEG arg is all digits.  */
 
+  const char *p;
   for (p = arg; p != arg1 && *p >= '0' && *p <= '9'; p++);
-  linenum_beg = (p == arg1);
+  bool linenum_beg = (p == arg1);
 
   /* Save the range of the first argument, in case we need to let the
      user know it was ambiguous.  */
   const char *beg = arg;
   size_t beg_len = arg1 - beg;
+  bool dummy_end = false;
+  bool no_end = true;
 
   arg1 = skip_spaces (arg1);
   if (*arg1 == ',')
     {
-      no_end = 0;
+      no_end = false;
       if (sals.size () > 1)
        {
          ambiguous_line_spec (sals,
@@ -1415,8 +1411,8 @@ list_command (const char *arg, int from_tty)
        }
       arg1++;
       arg1 = skip_spaces (arg1);
-      if (*arg1 == 0)
-       dummy_end = 1;
+      if (*arg1 == '\0')
+       dummy_end = true;
       else
        {
          /* Save the last argument, in case we need to let the user
@@ -1426,7 +1422,7 @@ list_command (const char *arg, int from_tty)
          location_spec_up locspec
            = string_to_location_spec (&arg1, current_language);
 
-         if (*arg1)
+         if (*arg1 != '\0')
            error (_("Junk at end of line specification."));
 
          std::vector<symtab_and_line> sals_end
@@ -1450,7 +1446,7 @@ list_command (const char *arg, int from_tty)
        }
     }
 
-  if (*arg1)
+  if (*arg1 != '\0')
     error (_("Junk at end of line specification."));
 
   if (!no_end && !dummy_beg && !dummy_end
@@ -1462,19 +1458,17 @@ list_command (const char *arg, int from_tty)
   /* If line was specified by address,
      first print exactly which line, and which file.
 
-     In this case, sal.symtab == 0 means address is outside of all
+     In this case, sal.symtab == NULL means address is outside of all
      known source files, not that user failed to give a filename.  */
   if (*arg == '*')
     {
-      struct gdbarch *gdbarch;
-
-      if (sal.symtab == 0)
+      if (sal.symtab == nullptr)
        error (_("No source file for address %s."),
               paddress (get_current_arch (), sal.pc));
 
-      gdbarch = sal.symtab->compunit ()->objfile ()->arch ();
-      sym = find_symbol_for_pc (sal.pc);
-      if (sym)
+      struct gdbarch *gdbarch = sal.symtab->compunit ()->objfile ()->arch ();
+      struct symbol *sym = find_symbol_for_pc (sal.pc);
+      if (sym != nullptr)
        gdb_printf ("%ps is in %s (%ps:%ps).\n",
                    styled_string (address_style.style (),
                                   paddress (gdbarch, sal.pc)),
@@ -1497,7 +1491,7 @@ list_command (const char *arg, int from_tty)
      imply a symtab, it must be an undebuggable symbol which means no
      source code.  */
 
-  if (!linenum_beg && sal.symtab == 0)
+  if (!linenum_beg && sal.symtab == nullptr)
     error (_("No line number known for %s."), arg);
 
   /* If this command is repeated with RET,
@@ -1506,7 +1500,7 @@ list_command (const char *arg, int from_tty)
   if (from_tty)
     set_repeat_arguments ("");
 
-  if (dummy_beg && sal_end.symtab == 0)
+  if (dummy_beg && sal_end.symtab == nullptr)
     error (_("No default source file yet.  Do \"help list\"."));
   if (dummy_beg)
     {
@@ -1514,19 +1508,15 @@ list_command (const char *arg, int from_tty)
                                source_lines_range::BACKWARD);
       print_source_lines (sal_end.symtab, range, 0);
     }
-  else if (sal.symtab == 0)
+  else if (sal.symtab == nullptr)
     error (_("No default source file yet.  Do \"help list\"."));
   else if (no_end)
     {
-      for (int i = 0; i < sals.size (); i++)
+      for (const symtab_and_line &s : sals)
        {
-         sal = sals[i];
-         int first_line = sal.line - get_lines_to_list () / 2;
-         if (first_line < 1)
-           first_line = 1;
          if (sals.size () > 1)
-           print_sal_location (sal);
-         print_source_lines (sal.symtab, source_lines_range (first_line), 0);
+           print_sal_location (s);
+         list_around_line (nullptr, s);
        }
     }
   else if (dummy_end)