diff options
author | Pedro Alves <palves@redhat.com> | 2019-06-13 00:06:54 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2019-06-13 00:24:17 +0100 |
commit | 6206060d9be8da3e701fe0307c6c01390e2b4ae2 (patch) | |
tree | 3e8f08e72db035a5278c44f53f737d59d8a547f1 /gdb/cli | |
parent | 6665660a411ead049daa85cac5c629d637e22044 (diff) | |
download | gdb-6206060d9be8da3e701fe0307c6c01390e2b4ae2.zip gdb-6206060d9be8da3e701fe0307c6c01390e2b4ae2.tar.gz gdb-6206060d9be8da3e701fe0307c6c01390e2b4ae2.tar.bz2 |
Delete parse_flags/parse_flags_qcs
Now that "thread/frame apply" have been converted to the gdb::option
framework, these functions are no longer used.
For a while, I thought about keeping the unit tests, by making a local
version of parse_flags_qcs in the unit tests file. But all that would
really test that is used by GDB itself, is the validate_flags_qcs
function. So in the end, I went through all the unit tests, and
converted any that wasn't already covered to gdb.base/options.exp
tests. And those have all already been added in previous patches.
gdb/ChangeLog:
2019-06-13 Pedro Alves <palves@redhat.com>
* cli/cli-utils.c (parse_flags, parse_flags_qcs): Delete.
* cli/cli-utils.h (parse_flags, parse_flags_qcs): Delete.
* unittests/cli-utils-selftests.c (test_parse_flags)
(test_parse_flags_qcs): Delete.
(test_cli_utils): Don't call deleted functions.
Diffstat (limited to 'gdb/cli')
-rw-r--r-- | gdb/cli/cli-utils.c | 56 | ||||
-rw-r--r-- | gdb/cli/cli-utils.h | 30 |
2 files changed, 0 insertions, 86 deletions
diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c index 30d4091..f5d47ae 100644 --- a/gdb/cli/cli-utils.c +++ b/gdb/cli/cli-utils.c @@ -524,62 +524,6 @@ check_for_argument (const char **str, const char *arg, int arg_len) /* See documentation in cli-utils.h. */ -int -parse_flags (const char **str, const char *flags) -{ - const char *p = skip_spaces (*str); - - if (p[0] == '-' - && isalpha (p[1]) - && (p[2] == '\0' || isspace (p[2]))) - { - const char pf = p[1]; - const char *f = flags; - - while (*f != '\0') - { - if (*f == pf) - { - *str = skip_spaces (p + 2); - return f - flags + 1; - } - f++; - } - } - - return 0; -} - -/* See documentation in cli-utils.h. */ - -bool -parse_flags_qcs (const char *which_command, const char **str, - qcs_flags *flags) -{ - switch (parse_flags (str, "qcs")) - { - case 0: - return false; - case 1: - flags->quiet = true; - break; - case 2: - flags->cont = true; - break; - case 3: - flags->silent = true; - break; - default: - gdb_assert_not_reached ("int qcs flag out of bound"); - } - - validate_flags_qcs (which_command, flags); - - return true; -} - -/* See documentation in cli-utils.h. */ - void validate_flags_qcs (const char *which_command, qcs_flags *flags) { diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h index e6b877d..c2a0f37 100644 --- a/gdb/cli/cli-utils.h +++ b/gdb/cli/cli-utils.h @@ -220,15 +220,6 @@ check_for_argument (char **str, const char *arg) return check_for_argument (str, arg, strlen (arg)); } -/* A helper function that looks for a set of flags at the start of a - string. The possible flags are given as a null terminated string. - A flag in STR must either be at the end of the string, - or be followed by whitespace. - Returns 0 if no valid flag is found at the start of STR. - Otherwise updates *STR, and returns N (which is > 0), - such that FLAGS [N - 1] is the valid found flag. */ -extern int parse_flags (const char **str, const char *flags); - /* qcs_flags struct groups the -q, -c, and -s flags parsed by "thread apply" and "frame apply" commands */ @@ -239,27 +230,6 @@ struct qcs_flags int silent = false; }; -/* A helper function that uses parse_flags to handle the flags qcs : - A flag -q sets FLAGS->QUIET to true. - A flag -c sets FLAGS->CONT to true. - A flag -s sets FLAGS->SILENT to true. - - The caller is responsible to initialize *FLAGS to false before the (first) - call to parse_flags_qcs. - parse_flags_qcs can then be called iteratively to search for more - valid flags, as part of a 'main parsing loop' searching for -q/-c/-s - flags together with other flags and options. - - Returns true and updates *STR and one of FLAGS->QUIET, FLAGS->CONT, - FLAGS->SILENT if it finds a valid flag. - Returns false if no valid flag is found at the beginning of STR. - - Throws an error if a flag is found such that both FLAGS->CONT and - FLAGS->SILENT are true. */ - -extern bool parse_flags_qcs (const char *which_command, const char **str, - qcs_flags *flags); - /* Validate FLAGS. Throws an error if both FLAGS->CONT and FLAGS->SILENT are true. WHICH_COMMAND is included in the error message. */ |