diff options
author | Tom Tromey <tromey@adacore.com> | 2022-12-14 12:28:32 -0700 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2022-12-15 12:13:35 -0700 |
commit | 2e55fbce03a0bbee40032b486fe565bfc2423894 (patch) | |
tree | df6b897deaa72f1a366042b2cdea69c0c15a1220 | |
parent | c573941878c15ecd8f0985cbe3fb8370abe4c807 (diff) | |
download | binutils-2e55fbce03a0bbee40032b486fe565bfc2423894.zip binutils-2e55fbce03a0bbee40032b486fe565bfc2423894.tar.gz binutils-2e55fbce03a0bbee40032b486fe565bfc2423894.tar.bz2 |
Move streq and compare_cstrings to gdbsupport
It seems to me that streq and compare_cstrings belong near the other
string utility functions in common-utils.h; and furthermore that streq
ought to be inlined. This patch makes this change.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
-rw-r--r-- | gdb/utils.c | 8 | ||||
-rw-r--r-- | gdb/utils.h | 12 | ||||
-rw-r--r-- | gdbsupport/common-utils.h | 16 |
3 files changed, 16 insertions, 20 deletions
diff --git a/gdb/utils.c b/gdb/utils.c index 5c110da..74917f2 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3099,14 +3099,6 @@ strcmp_iw_ordered (const char *string1, const char *string2) } } -/* See utils.h. */ - -bool -streq (const char *lhs, const char *rhs) -{ - return !strcmp (lhs, rhs); -} - static void diff --git a/gdb/utils.h b/gdb/utils.h index ad7c949..509361d 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -98,18 +98,6 @@ extern int strcmp_iw (const char *string1, const char *string2); extern int strcmp_iw_ordered (const char *, const char *); -/* Return true if the strings are equal. */ - -extern bool streq (const char *, const char *); - -/* Compare C strings for std::sort. */ - -static inline bool -compare_cstrings (const char *str1, const char *str2) -{ - return strcmp (str1, str2) < 0; -} - /* Reset the prompt_for_continue clock. */ void reset_prompt_for_continue_wait_time (void); /* Return the time spent in prompt_for_continue. */ diff --git a/gdbsupport/common-utils.h b/gdbsupport/common-utils.h index 8a9448a..92d7caa 100644 --- a/gdbsupport/common-utils.h +++ b/gdbsupport/common-utils.h @@ -93,6 +93,22 @@ startswith (gdb::string_view string, gdb::string_view pattern) && strncmp (string.data (), pattern.data (), pattern.length ()) == 0); } +/* Return true if the strings are equal. */ + +static inline bool +streq (const char *lhs, const char *rhs) +{ + return strcmp (lhs, rhs) == 0; +} + +/* Compare C strings for std::sort. */ + +static inline bool +compare_cstrings (const char *str1, const char *str2) +{ + return strcmp (str1, str2) < 0; +} + ULONGEST strtoulst (const char *num, const char **trailer, int base); /* Skip leading whitespace characters in INP, returning an updated |