diff options
| author | Bernhard Reutner-Fischer | 2007-03-29 10:30:50 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2007-03-29 10:30:50 +0000 |
| commit | 3e816c1252cc55e3763f946622129d31ea1f0f20 (patch) | |
| tree | 5031fd816b1df09eaa897530a37ce814bba95011 /findutils | |
| parent | 3d43edb28c80ee9cb54335f593d42d5d0471e15a (diff) | |
| download | busybox-3e816c1252cc55e3763f946622129d31ea1f0f20.zip busybox-3e816c1252cc55e3763f946622129d31ea1f0f20.tar.gz | |
- fold recurse, depthFirst and dereference params into one param flags.
Minor size improvement (-16b for size, -24b according to bloat-o-meter).
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/find.c | 14 | ||||
| -rw-r--r-- | findutils/grep.c | 6 |
2 files changed, 9 insertions, 11 deletions
diff --git a/findutils/find.c b/findutils/find.c index e98d995..c043fbc 100644 --- a/findutils/find.c +++ b/findutils/find.c @@ -574,7 +574,7 @@ static action*** parse_params(char **argv) int find_main(int argc, char **argv); int find_main(int argc, char **argv) { - int dereference = FALSE; + bool dereference = FALSE; char *arg; char **argp; int i, firstopt, status = EXIT_SUCCESS; @@ -632,13 +632,11 @@ int find_main(int argc, char **argv) for (i = 1; i < firstopt; i++) { if (!recursive_action(argv[i], - TRUE, // recurse - dereference, // follow links - FALSE, // depth first - fileAction, // file action - fileAction, // dir action - NULL, // user data - 0)) // depth + action_recurse|(1<<dereference), /* flags */ + fileAction, /* file action */ + fileAction, /* dir action */ + NULL, /* user data */ + 0)) /* depth */ status = EXIT_FAILURE; } return status; diff --git a/findutils/grep.c b/findutils/grep.c index f6ea54e..43810ea 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -336,9 +336,9 @@ static int grep_dir(const char *dir) { int matched = 0; recursive_action(dir, - /* recurse= */ 1, - /* followLinks= */ 0, - /* depthFirst= */ 1, + /* recurse= */ action_recurse | + /* followLinks= */ /* no. 0 | */ + /* depthFirst= */ action_depthFirst, /* fileAction= */ file_action_grep, /* dirAction= */ NULL, /* userData= */ &matched, |