get_ref_dir(): rename "base" parameter to "dirname"

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index ed6d84230da4aac6aec2875c7fe181905f73b1eb..37ea557f3e843548d8418c51ec283aa05d4a4c14 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -749,30 +749,30 @@ void add_packed_ref(const char *refname, const unsigned char *sha1)
                        create_ref_entry(refname, sha1, REF_ISPACKED, 1));
 }
 
                        create_ref_entry(refname, sha1, REF_ISPACKED, 1));
 }
 

-static void get_ref_dir(struct ref_cache *refs, const char *base,
+static void get_ref_dir(struct ref_cache *refs, const char *dirname,

                        struct ref_dir *dir)
 {
        DIR *d;
        const char *path;
        struct dirent *de;
                        struct ref_dir *dir)
 {
        DIR *d;
        const char *path;
        struct dirent *de;

-       int baselen;
+       int dirnamelen;

        struct strbuf refname;
 
        if (*refs->name)
        struct strbuf refname;
 
        if (*refs->name)

-               path = git_path_submodule(refs->name, "%s", base);
+               path = git_path_submodule(refs->name, "%s", dirname);

        else
        else

-               path = git_path("%s", base);
+               path = git_path("%s", dirname);

 
        d = opendir(path);
        if (!d)
                return;
 
 
        d = opendir(path);
        if (!d)
                return;
 

-       baselen = strlen(base);
-       strbuf_init(&refname, baselen + 257);
-       strbuf_add(&refname, base, baselen);
-       if (baselen && base[baselen-1] != '/') {
+       dirnamelen = strlen(dirname);
+       strbuf_init(&refname, dirnamelen + 257);
+       strbuf_add(&refname, dirname, dirnamelen);
+       if (dirnamelen && dirname[dirnamelen-1] != '/') {

                strbuf_addch(&refname, '/');
                strbuf_addch(&refname, '/');

-               baselen++;
+               dirnamelen++;

        }
 
        while ((de = readdir(d)) != NULL) {
        }
 
        while ((de = readdir(d)) != NULL) {


@@ -807,7 +807,7 @@ static void get_ref_dir(struct ref_cache *refs, const char *base,
                        }
                        add_ref(dir, create_ref_entry(refname.buf, sha1, flag, 1));
                }
                        }
                        add_ref(dir, create_ref_entry(refname.buf, sha1, flag, 1));
                }

-               strbuf_setlen(&refname, baselen);
+               strbuf_setlen(&refname, dirnamelen);

        }
        strbuf_release(&refname);
        closedir(d);
        }
        strbuf_release(&refname);
        closedir(d);