refs: use strings directly in find_containing_dir()

Convert the parameter subdirname of search_for_subdir() to a
length-limted string and then simply pass the interesting slice of the
refname from find_containing_dir(), thereby avoiding to duplicate the
string.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index c5e167bb9f8569c6afe9d7fc380761dfddb5e555..96e943c368a9c697a588cd2c1c01757c3617733c 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -352,9 +352,9 @@ static struct ref_entry *search_ref_dir(struct ref_dir *dir,
  * directory cannot be found.  dir must already be complete.
  */
 static struct ref_dir *search_for_subdir(struct ref_dir *dir,
  * directory cannot be found.  dir must already be complete.
  */
 static struct ref_dir *search_for_subdir(struct ref_dir *dir,

-                                        const char *subdirname, int mkdir)
+                                        const char *subdirname, size_t len,
+                                        int mkdir)

 {
 {

-       size_t len = strlen(subdirname);

        struct ref_entry *entry = search_ref_dir(dir, subdirname, len);
        if (!entry) {
                if (!mkdir)
        struct ref_entry *entry = search_ref_dir(dir, subdirname, len);
        if (!entry) {
                if (!mkdir)


@@ -383,15 +383,11 @@ static struct ref_dir *search_for_subdir(struct ref_dir *dir,
 static struct ref_dir *find_containing_dir(struct ref_dir *dir,
                                           const char *refname, int mkdir)
 {
 static struct ref_dir *find_containing_dir(struct ref_dir *dir,
                                           const char *refname, int mkdir)
 {

-       struct strbuf dirname;

        const char *slash;
        const char *slash;

-       strbuf_init(&dirname, PATH_MAX);

        for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) {
        for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) {

+               size_t dirnamelen = slash - refname + 1;

                struct ref_dir *subdir;
                struct ref_dir *subdir;

-               strbuf_add(&dirname,
-                          refname + dirname.len,
-                          (slash + 1) - (refname + dirname.len));
-               subdir = search_for_subdir(dir, dirname.buf, mkdir);
+               subdir = search_for_subdir(dir, refname, dirnamelen, mkdir);

                if (!subdir) {
                        dir = NULL;
                        break;
                if (!subdir) {
                        dir = NULL;
                        break;


@@ -399,7 +395,6 @@ static struct ref_dir *find_containing_dir(struct ref_dir *dir,
                dir = subdir;
        }
 
                dir = subdir;
        }
 

-       strbuf_release(&dirname);

        return dir;
 }
 
        return dir;
 }