diff options
author | Bernhard Voelker <mail@bernhard-voelker.de> | 2022-03-28 22:27:35 +0200 |
---|---|---|
committer | Bernhard Voelker <mail@bernhard-voelker.de> | 2022-03-30 21:55:35 +0200 |
commit | 82e81acc5cf0caaf493227ad80bf35e85089eb48 (patch) | |
tree | 90f30c9b69bf0f5fa02a34c6b5d974af895d80ca | |
parent | fa7e628e19c75a3650b9010a37f3388758245b68 (diff) | |
download | findutils-82e81acc5cf0caaf493227ad80bf35e85089eb48.tar.gz |
maint: simplify check_name_arg in parser.c
* find/parser.c (check_name_arg): Change to void; remove return statement.
(parse_iname): Adjust caller.
(parse_name): Likewise.
-rw-r--r-- | find/parser.c | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/find/parser.c b/find/parser.c index 5b5e52a2..75c730c3 100644 --- a/find/parser.c +++ b/find/parser.c @@ -1267,7 +1267,7 @@ fnmatch_sanitycheck (void) } -static bool +static void check_name_arg (const char *pred, const char *alt, const char *arg) { if (should_issue_warnings () && strchr (arg, '/')) @@ -1281,7 +1281,6 @@ check_name_arg (const char *pred, const char *alt, const char *arg) safely_quote_err_filename (1, "/"), safely_quote_err_filename (2, alt)); } - return true; /* allow it anyway */ } @@ -1293,14 +1292,14 @@ parse_iname (const struct parser_table* entry, char **argv, int *arg_ptr) fnmatch_sanitycheck (); if (collect_arg (argv, arg_ptr, &name)) { - if (check_name_arg ("-iname", "-iwholename", name)) - { - struct predicate *our_pred = insert_primary (entry, name); - our_pred->need_stat = our_pred->need_type = false; - our_pred->args.str = name; - our_pred->est_success_rate = estimate_pattern_match_rate (name, 0); - return true; - } + struct predicate *our_pred; + check_name_arg ("-iname", "-iwholename", name); + + our_pred = insert_primary (entry, name); + our_pred->need_stat = our_pred->need_type = false; + our_pred->args.str = name; + our_pred->est_success_rate = estimate_pattern_match_rate (name, 0); + return true; } return false; } @@ -1475,23 +1474,17 @@ static bool parse_name (const struct parser_table* entry, char **argv, int *arg_ptr) { const char *name; - const int saved_argc = *arg_ptr; - + fnmatch_sanitycheck (); if (collect_arg (argv, arg_ptr, &name)) { - fnmatch_sanitycheck (); - if (check_name_arg ("-name", "-wholename", name)) - { - struct predicate *our_pred = insert_primary (entry, name); - our_pred->need_stat = our_pred->need_type = false; - our_pred->args.str = name; - our_pred->est_success_rate = estimate_pattern_match_rate (name, 0); - return true; - } - else - { - *arg_ptr = saved_argc; /* don't consume the invalid argument. */ - } + struct predicate *our_pred; + check_name_arg ("-name", "-wholename", name); + + our_pred = insert_primary (entry, name); + our_pred->need_stat = our_pred->need_type = false; + our_pred->args.str = name; + our_pred->est_success_rate = estimate_pattern_match_rate (name, 0); + return true; } return false; } |