From ccefcddb61ed700be40ef36fdc751d0b7357bc13 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 22 Apr 2013 15:15:53 -0700 Subject: [PATCH] More removal of support for -perm +MODE. * find/parser.c (parse_perm): Remove no-longer-needed local var and associated code. Reported by Eric Blake in . --- ChangeLog | 7 +++++++ find/parser.c | 26 +------------------------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 582ca05..e6914ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-04-22 Paul Eggert + + More removal of support for -perm +MODE. + * find/parser.c (parse_perm): Remove no-longer-needed local var + and associated code. Reported by Eric Blake in + . + 2013-04-21 Paul Eggert Remove support for obsolete -perm +MODE syntax. diff --git a/find/parser.c b/find/parser.c index 6d9005c..01d1050 100644 --- a/find/parser.c +++ b/find/parser.c @@ -1949,7 +1949,6 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr) mode_t perm_val[2]; float rate; int mode_start = 0; - bool havekind = false; enum permissions_type kind = PERM_EXACT; struct mode_change *change; struct predicate *our_pred; @@ -1963,14 +1962,12 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr) case '-': mode_start = 1; kind = PERM_AT_LEAST; - havekind = true; rate = 0.2; break; case '/': /* GNU extension */ mode_start = 1; kind = PERM_ANY; - havekind = true; rate = 0.3; break; @@ -1980,7 +1977,6 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr) */ mode_start = 0; kind = PERM_EXACT; - havekind = true; rate = 0.01; break; } @@ -2018,7 +2014,6 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr) perm_expr); kind = PERM_AT_LEAST; - havekind = true; /* The "magic" number below is just the fraction of files on my * own system that "-type l -xtype l" fails for (i.e. unbroken symlinks). @@ -2029,26 +2024,7 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr) our_pred = insert_primary (entry, perm_expr); our_pred->est_success_rate = rate; - if (havekind) - { - our_pred->args.perm.kind = kind; - } - else - { - - switch (perm_expr[0]) - { - case '-': - our_pred->args.perm.kind = PERM_AT_LEAST; - break; - case '+': - our_pred->args.perm.kind = PERM_ANY; - break; - default: - our_pred->args.perm.kind = PERM_EXACT; - break; - } - } + our_pred->args.perm.kind = kind; memcpy (our_pred->args.perm.val, perm_val, sizeof perm_val); return true; } -- 1.7.11.7