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 <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/dir.c b/dir.c
index d5444fbe9b4b0f179cb987bb895aec1bac2fee93..ed1510fbc808f4c9799eb84a3c38030b7565f3bc 100644 (file)
--- 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)
 {
 
 int fill_directory(struct dir_struct *dir, const char **pathspec)
 {

-       const char *path;

        size_t len;
 
        /*
        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);
         * 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 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;
 }
 
        return len;
 }