diff options
author | Elijah Newren <newren@gmail.com> | 2021-05-12 17:28:22 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-12 23:45:03 (GMT) |
commit | b548f0f1568f6b01e55ca69c24d3cb19489f92aa (patch) | |
tree | 0a6c2580b275d3565b5a8de558fa4e49fbed1fb5 /packfile.c | |
parent | 4e689d81718eb6e939cace317ea3e33cb994dcbb (diff) | |
download | git-b548f0f1568f6b01e55ca69c24d3cb19489f92aa.zip git-b548f0f1568f6b01e55ca69c24d3cb19489f92aa.tar.gz git-b548f0f1568f6b01e55ca69c24d3cb19489f92aa.tar.bz2 |
dir: introduce readdir_skip_dot_and_dotdot() helper
Many places in the code were doing
while ((d = readdir(dir)) != NULL) {
if (is_dot_or_dotdot(d->d_name))
continue;
...process d...
}
Introduce a readdir_skip_dot_and_dotdot() helper to make that a one-liner:
while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL) {
...process d...
}
This helper particularly simplifies checks for empty directories.
Also use this helper in read_cached_dir() so that our statistics are
consistent across platforms. (In other words, read_cached_dir() should
have been using is_dot_or_dotdot() and skipping such entries, but did
not and left it to treat_path() to detect and mark such entries as
path_none.)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'packfile.c')
-rw-r--r-- | packfile.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -813,10 +813,7 @@ void for_each_file_in_pack_dir(const char *objdir, } strbuf_addch(&path, '/'); dirnamelen = path.len; - while ((de = readdir(dir)) != NULL) { - if (is_dot_or_dotdot(de->d_name)) - continue; - + while ((de = readdir_skip_dot_and_dotdot(dir)) != NULL) { strbuf_setlen(&path, dirnamelen); strbuf_addstr(&path, de->d_name); |