diff mbox series

[1/2] Remove subset_compare

Message ID 20221214194606.4141035-2-tromey@adacore.com
State Committed
Commit c573941878c15ecd8f0985cbe3fb8370abe4c807
Headers
Series Two minor cleanups |

Commit Message

Tom Tromey Dec. 14, 2022, 7:46 p.m. UTC 
  I stumbled across subset_compare today, and after looking at the
callers I realized it could be removed and replaced with calls to
startswith.
---
 gdb/stack.c       |  6 +++---
 gdb/tui/tui-win.c |  4 ++--
 gdb/utils.c       | 20 --------------------
 gdb/utils.h       |  2 --
 4 files changed, 5 insertions(+), 27 deletions(-)
diff mbox series

Patch

diff --git a/gdb/stack.c b/gdb/stack.c
index 4ad51c2eb50..c7d392842ae 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -2140,17 +2140,17 @@  parse_backtrace_qualifiers (const char *arg,
       if (this_arg.empty ())
 	return arg;
 
-      if (subset_compare (this_arg.c_str (), "no-filters"))
+      if (startswith ("no-filters", this_arg))
 	{
 	  if (bt_cmd_opts != nullptr)
 	    bt_cmd_opts->no_filters = true;
 	}
-      else if (subset_compare (this_arg.c_str (), "full"))
+      else if (startswith ("full", this_arg))
 	{
 	  if (bt_cmd_opts != nullptr)
 	    bt_cmd_opts->full = true;
 	}
-      else if (subset_compare (this_arg.c_str (), "hide"))
+      else if (startswith ("hide", this_arg))
 	{
 	  if (bt_cmd_opts != nullptr)
 	    bt_cmd_opts->hide = true;
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index e24763c0072..bad8ffe0972 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -711,9 +711,9 @@  tui_set_focus_command (const char *arg, int from_tty)
 
   struct tui_win_info *win_info = NULL;
 
-  if (subset_compare (arg, "next"))
+  if (startswith ("next", arg))
     win_info = tui_next_win (tui_win_with_focus ());
-  else if (subset_compare (arg, "prev"))
+  else if (startswith ("prev", arg))
     win_info = tui_prev_win (tui_win_with_focus ());
   else
     win_info = tui_partial_win_by_name (arg);
diff --git a/gdb/utils.c b/gdb/utils.c
index c37d9add500..5c110daa4ae 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -3109,26 +3109,6 @@  streq (const char *lhs, const char *rhs)
 
 
 
-/*
-   ** subset_compare()
-   **    Answer whether string_to_compare is a full or partial match to
-   **    template_string.  The partial match must be in sequence starting
-   **    at index 0.
- */
-int
-subset_compare (const char *string_to_compare, const char *template_string)
-{
-  int match;
-
-  if (template_string != NULL && string_to_compare != NULL
-      && strlen (string_to_compare) <= strlen (template_string))
-    match =
-      (startswith (template_string, string_to_compare));
-  else
-    match = 0;
-  return match;
-}
-
 static void
 show_debug_timestamp (struct ui_file *file, int from_tty,
 		      struct cmd_list_element *c, const char *value)
diff --git a/gdb/utils.h b/gdb/utils.h
index d2acf899ba2..ad7c94988b7 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -102,8 +102,6 @@  extern int strcmp_iw_ordered (const char *, const char *);
 
 extern bool streq (const char *, const char *);
 
-extern int subset_compare (const char *, const char *);
-
 /* Compare C strings for std::sort.  */
 
 static inline bool