gdb: Switch "info types" over to use the gdb::options framework

[deliverable/binutils-gdb.git] / gdb / ax-gdb.c

diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 0783ab1fb9f525365467760096130b3e8934ed6a..9f1b7a1e88b181d6e1617b0bce84fe45c115ff64 100644 (file)
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -18,36 +18,35 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "arch-utils.h"
-#include "ax-gdb.h"
+#include "symtab.h"
+#include "symfile.h"
+#include "gdbtypes.h"
+#include "language.h"
+#include "value.h"
+#include "expression.h"
+#include "command.h"
+#include "gdbcmd.h"
+#include "frame.h"
+#include "target.h"
 #include "ax.h"
+#include "ax-gdb.h"
 #include "block.h"
+#include "regcache.h"
+#include "user-regs.h"
+#include "dictionary.h"
 #include "breakpoint.h"
-#include "c-lang.h"
-#include "cli/cli-utils.h"
-#include "command.h"
-#include "common/format.h"
+#include "tracepoint.h"
 #include "cp-support.h"
-#include "dictionary.h"
-#include "expression.h"
-#include "frame.h"
-#include "gdbcmd.h"
-#include "gdbtypes.h"
-#include "language.h"
+#include "arch-utils.h"
+#include "cli/cli-utils.h"
 #include "linespec.h"
 #include "location.h"
 #include "objfiles.h"
-#include "regcache.h"
-#include "symfile.h"
-#include "symtab.h"
-#include "target.h"
-#include "tracepoint.h"
 #include "typeprint.h"
-#include "user-regs.h"
 #include "valprint.h"
-#include "value.h"
+#include "c-lang.h"
+
+#include "gdbsupport/format.h"
 
 /* To make sense of this file, you should read doc/agentexpr.texi.
    Then look at the types and enums in ax-gdb.h.  For the code itself,
@@ -2635,12 +2634,10 @@ agent_command_1 (const char *exp, int eval)
     {
       struct linespec_result canonical;
 
-      exp = skip_spaces (exp);
-
       event_location_up location
        = new_linespec_location (&exp, symbol_name_match_type::WILD);
       decode_line_full (location.get (), DECODE_LINE_FUNFIRSTLINE, NULL,
-                       (struct symtab *) NULL, 0, &canonical,
+                       NULL, 0, &canonical,
                        NULL, NULL);
       exp = skip_spaces (exp);
       if (exp[0] == ',')