undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir: avoid allocation in fill_directory()

Browse Source 
Pass the match member of the first pathspec item directly to
read_directory() instead of using common_prefix() to duplicate it first,
thus avoiding memory duplication, strlen(3) and free(3).

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2017-02-07 23:04:25 +01:00 committed by Junio C Hamano
parent 6e3a7b3398
commit bec5ab8997
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dir.c
View File

@ -174,20 +174,19 @@ char *common_prefix(const struct pathspec *pathspec)
int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec) int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec)
{ {
char *prefix; const char *prefix;
size_t prefix_len; size_t prefix_len;
/* /*
* Calculate common prefix for the pathspec, and * Calculate common prefix for the pathspec, and
* use that to optimize the directory walk * use that to optimize the directory walk
*/ */
prefix = common_prefix(pathspec); prefix_len = common_prefix_len(pathspec);
prefix_len = prefix ? strlen(prefix) : 0; prefix = prefix_len ? pathspec->items[0].match : "";
/* Read the directory and prune it */ /* Read the directory and prune it */
read_directory(dir, prefix, prefix_len, pathspec); read_directory(dir, prefix, prefix_len, pathspec);
free(prefix);
return prefix_len; return prefix_len;
} }