cpu,opcodes,gas: fix explicit arguments to eBPF ldabs instructions

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

diff --git a/gdb/skip.c b/gdb/skip.c
index f2a1df79e8bf87eb08f2dd96ed67fc41ad259971..039d50cb117e90f023c840f7d190d171bc0f4475 100644 (file)
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -1,6 +1,6 @@
 /* Skipping uninteresting files and functions while stepping.
 
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2019 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 #include "filenames.h"
 #include "fnmatch.h"
 #include "gdb_regex.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include <list>
 
 /* True if we want to print debug printouts related to file/function
@@ -413,7 +413,8 @@ info_skip_command (const char *arg, int from_tty)
 
       current_uiout->field_string ("file",
                                   e.file ().empty () ? "<none>"
-                                  : e.file ().c_str ()); /* 4 */
+                                  : e.file ().c_str (),
+                                  ui_out_style_kind::FILE); /* 4 */
       if (e.function_is_regexp ())
        current_uiout->field_string ("regexp", "y"); /* 5 */
       else
@@ -421,7 +422,8 @@ info_skip_command (const char *arg, int from_tty)
 
       current_uiout->field_string ("function",
                                   e.function ().empty () ? "<none>"
-                                  : e.function ().c_str ()); /* 6 */
+                                  : e.function ().c_str (),
+                                  ui_out_style_kind::FUNCTION); /* 6 */
 
       current_uiout->text ("\n");
     }
@@ -717,14 +719,11 @@ Usage: skip delete [NUMBER | RANGES]..."),
               &skiplist);
   set_cmd_completer (c, complete_skip_number);
 
-  c = add_info ("skip", info_skip_command, _("\
-Display the status of skips.  You can specify numbers (e.g. \"skip info 1 3\"), \
-ranges (e.g. \"skip info 4-8\"), or both (e.g. \"skip info 1 3 4-8\").\n\n\
+  add_info ("skip", info_skip_command, _("\
+Display the status of skips.  You can specify numbers (e.g. \"info skip 1 3\"), \
+ranges (e.g. \"info skip 4-8\"), or both (e.g. \"info skip 1 3 4-8\").\n\n\
 If you don't specify any numbers or ranges, we'll show all skips.\n\n\
-Usage: skip info [NUMBER | RANGES]...\n\
-The \"Type\" column indicates one of:\n\
-\tfile        - ignored file\n\
-\tfunction    - ignored function"));
+Usage: info skip [NUMBER | RANGES]..."));
   set_cmd_completer (c, complete_skip_number);
 
   add_setshow_boolean_cmd ("skip", class_maintenance,