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>
Michael Haggerty committed
Apr 25, 2012 at 00:45 UTC
66a3d20b8f8566581e8aa46e35555f353074f232
1 file changed
+10
-10
refs.c
+10
-10
@@ -749,30 +749,30 @@ void add_packed_ref(const char *refname, const unsigned char *sha1)
749
create_ref_entry(refname, sha1, REF_ISPACKED, 1));
750
}
751
752
-static void get_ref_dir(struct ref_cache *refs, const char *base,
752
+static void get_ref_dir(struct ref_cache *refs, const char *dirname,
753
struct ref_dir *dir)
754
{
755
DIR *d;
756
const char *path;
757
struct dirent *de;
758
- int baselen;
758
+ int dirnamelen;
759
struct strbuf refname;
760
761
if (*refs->name)
762
- path = git_path_submodule(refs->name, "%s", base);
762
+ path = git_path_submodule(refs->name, "%s", dirname);
763
else
764
- path = git_path("%s", base);
764
+ path = git_path("%s", dirname);
765
766
d = opendir(path);
767
if (!d)
768
return;
769
770
- baselen = strlen(base);
771
- strbuf_init(&refname, baselen + 257);
772
- strbuf_add(&refname, base, baselen);
773
- if (baselen && base[baselen-1] != '/') {
770
+ dirnamelen = strlen(dirname);
771
+ strbuf_init(&refname, dirnamelen + 257);
772
+ strbuf_add(&refname, dirname, dirnamelen);
773
+ if (dirnamelen && dirname[dirnamelen-1] != '/') {
774
strbuf_addch(&refname, '/');
775
- baselen++;
775
+ dirnamelen++;
776
}
777
778
while ((de = readdir(d)) != NULL) {
@@ -807,7 +807,7 @@ static void get_ref_dir(struct ref_cache *refs, const char *base,
807
}
808
add_ref(dir, create_ref_entry(refname.buf, sha1, flag, 1));
809
}
810
- strbuf_setlen(&refname, baselen);
810
+ strbuf_setlen(&refname, dirnamelen);
811
}
812
strbuf_release(&refname);
813
closedir(d);