[PATCH] sha1_file: add slash once in for_each_file_in_obj_subdir()
- From
René Scharfe <l.s.r@web.de>
- Date
- Jul 8, 2017, 08:59 UTC
- Message-ID
- <f59c8256-716b-9305-2a4f-d4fe49f666ff@web.de>
Add the slash between loose object subdirectory and file name just once outside the loop instead of overwriting it with each readdir call. Redefine baselen as the length with that slash, and add dirlen for the length without it. The result is slightly less wasteful and can use the the cheaper strbuf_addstr instead of strbuf_addf without losing clarity.
Signed-off-by: Rene Scharfe <l.s.r@web.de> --- sha1_file.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c index 5862386cd0..6a9deb9e68 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -3749,7 +3749,7 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr, each_loose_subdir_fn subdir_cb, void *data) { - size_t origlen, baselen; + size_t origlen, dirlen, baselen; DIR *dir; struct dirent *de; int r = 0; @@ -3760,7 +3760,7 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr, origlen = path->len; strbuf_complete(path, '/'); strbuf_addf(path, "%02x", subdir_nr); - baselen = path->len; + dirlen = path->len; dir = opendir(path->buf); if (!dir) { @@ -3770,12 +3770,15 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr, return r; } + strbuf_addch(path, '/'); + baselen = path->len; + while ((de = readdir(dir))) { if (is_dot_or_dotdot(de->d_name)) continue; strbuf_setlen(path, baselen); - strbuf_addf(path, "/%s", de->d_name); + strbuf_addstr(path, de->d_name); if (strlen(de->d_name) == GIT_SHA1_HEXSZ - 2) { char hex[GIT_MAX_HEXSZ+1]; @@ -3801,7 +3804,7 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr, } closedir(dir); - strbuf_setlen(path, baselen); + strbuf_setlen(path, dirlen); if (!r && subdir_cb) r = subdir_cb(subdir_nr, path->buf, data);
-- 2.13.2