From mboxrd@z Thu Jan 1 00:00:00 1970 From: mhagger@alum.mit.edu Subject: [PATCH 01/12] Rename another local variable name -> refname Date: Wed, 19 Oct 2011 23:44:41 +0200 Message-ID: <1319060692-27216-2-git-send-email-mhagger@alum.mit.edu> References: <1319060692-27216-1-git-send-email-mhagger@alum.mit.edu> Cc: git@vger.kernel.org, Jeff King , Drew Northup , Jakub Narebski , Heiko Voigt , Johan Herland , Julian Phillips , Michael Haggerty To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Oct 19 23:45:20 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RGdwt-00006A-J3 for gcvg-git-2@lo.gmane.org; Wed, 19 Oct 2011 23:45:19 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754641Ab1JSVpP (ORCPT ); Wed, 19 Oct 2011 17:45:15 -0400 Received: from mail.berlin.jpk.com ([212.222.128.130]:33117 "EHLO mail.berlin.jpk.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754445Ab1JSVpN (ORCPT ); Wed, 19 Oct 2011 17:45:13 -0400 Received: from michael.berlin.jpk.com ([192.168.100.152]) by mail.berlin.jpk.com with esmtp (Exim 4.50) id 1RGdqr-0004K1-Dg; Wed, 19 Oct 2011 23:39:05 +0200 X-Mailer: git-send-email 1.7.7 In-Reply-To: <1319060692-27216-1-git-send-email-mhagger@alum.mit.edu> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Michael Haggerty Signed-off-by: Michael Haggerty --- 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