[PATCH 01/12] Rename another local variable name -> refname
- From
mhagger@alum.mit.edu <mhagger@alum.mit.edu>
- Date
- Oct 19, 2011, 21:44 UTC
- Message-ID
- <1319060692-27216-2-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1319060692-27216-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> ---
I missed this one earlier. (There are probably others too. I hope you don't feel that I'm morally obliged to find every single analogous example...)
refs.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/refs.c b/refs.c index 7e6cea5..f6752a4 100644 --- a/refs.c +++ b/refs.c @@ -317,11 +317,11 @@ static void get_ref_dir(struct ref_cache *refs, const char *base, if (dir) { struct dirent *de; int baselen = strlen(base); - char *ref = xmalloc(baselen + 257); + char *refname = xmalloc(baselen + 257); - memcpy(ref, base, baselen); + memcpy(refname, base, baselen); if (baselen && base[baselen-1] != '/') - ref[baselen++] = '/'; + refname[baselen++] = '/'; while ((de = readdir(dir)) != NULL) { unsigned char sha1[20]; @@ -337,31 +337,31 @@ static void get_ref_dir(struct ref_cache *refs, const char *base, continue; if (has_extension(de->d_name, ".lock")) continue; - memcpy(ref + baselen, de->d_name, namelen+1); + memcpy(refname + baselen, de->d_name, namelen+1); refdir = *refs->name - ? git_path_submodule(refs->name, "%s", ref) - : git_path("%s", ref); + ? git_path_submodule(refs->name, "%s", refname) + : git_path("%s", refname); if (stat(refdir, &st) < 0) continue; if (S_ISDIR(st.st_mode)) { - get_ref_dir(refs, ref, array); + get_ref_dir(refs, refname, array); continue; } if (*refs->name) { hashclr(sha1); flag = 0; - if (resolve_gitlink_ref(refs->name, ref, sha1) < 0) { + if (resolve_gitlink_ref(refs->name, refname, sha1) < 0) { hashclr(sha1); flag |= REF_BROKEN; } } else - if (!resolve_ref(ref, sha1, 1, &flag)) { + if (!resolve_ref(refname, sha1, 1, &flag)) { hashclr(sha1); flag |= REF_BROKEN; } - add_ref(ref, sha1, flag, array, NULL); + add_ref(refname, sha1, flag, array, NULL); } - free(ref); + free(refname); closedir(dir); } }
-- 1.7.7