From 2b189435f341cb2c7089af4f22e307405e6243df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Fri, 11 May 2012 16:59:25 +0200 Subject: [PATCH] dir: simplify fill_directory() Now that read_directory_recursive() (reached through read_directory()) respects the string length limit we provide, we don't need to create a NUL-limited copy of the common prefix anymore. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- dir.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dir.c b/dir.c index d5444fbe9b..ed1510fbc8 100644 --- a/dir.c +++ b/dir.c @@ -74,7 +74,6 @@ char *common_prefix(const char **pathspec) int fill_directory(struct dir_struct *dir, const char **pathspec) { - const char *path; size_t len; /* @@ -82,15 +81,9 @@ int fill_directory(struct dir_struct *dir, const char **pathspec) * use that to optimize the directory walk */ len = common_prefix_len(pathspec); - path = ""; - - if (len) - path = xmemdupz(*pathspec, len); /* Read the directory and prune it */ - read_directory(dir, path, len, pathspec); - if (*path) - free((char *)path); + read_directory(dir, pathspec ? *pathspec : "", len, pathspec); return len; } -- 2.11.4.GIT