Re: [PATCH 04/14] refs: rename some parameters result -> sha1
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 13, 2011, 18:42 UTC
- Message-ID
- <7vmxd44ttt.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1318492715-5931-5-git-send-email-mhagger@alum.mit.edu>
mhagger@alum.mit.edu writes:
> From: Michael Haggerty <mhagger@alum.mit.edu> > > > Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
[PATCH 03/14] was about a similar topic and explained itself a lot better.
Even though it hinted as if it may be incomplete by saying "some" in the subject, it was clear from the description that it consistently renamed all the "name"s that are about references, not just "some" randomly chosen ones. It would have been better if the subject did not say "some" to avoid such implications.
Please give similar love to these sha1[] object names in this patch.
Show 88 quoted lines
> ---
> refs.c | 16 ++++++++--------
> refs.h | 2 +-
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 2ae5d0d..c466fcd 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -398,7 +398,7 @@ static struct ref_array *get_loose_refs(const char *submodule)
> #define MAXREFLEN (1024)
>
> static int resolve_gitlink_packed_ref(char *name, int pathlen,
> - const char *refname, unsigned char *result)
> + const char *refname, unsigned char *sha1)
> {
> int retval = -1;
> struct ref_entry *ref;
> @@ -406,14 +406,14 @@ static int resolve_gitlink_packed_ref(char *name, int pathlen,
>
> ref = search_ref_array(array, refname);
> if (ref != NULL) {
> - memcpy(result, ref->sha1, 20);
> + memcpy(sha1, ref->sha1, 20);
> retval = 0;
> }
> return retval;
> }
>
> static int resolve_gitlink_ref_recursive(char *name, int pathlen,
> - const char *refname, unsigned char *result,
> + const char *refname, unsigned char *sha1,
> int recursion)
> {
> int fd, len = strlen(refname);
> @@ -424,7 +424,7 @@ static int resolve_gitlink_ref_recursive(char *name, int pathlen,
> memcpy(name + pathlen, refname, len+1);
> fd = open(name, O_RDONLY);
> if (fd < 0)
> - return resolve_gitlink_packed_ref(name, pathlen, refname, result);
> + return resolve_gitlink_packed_ref(name, pathlen, refname, sha1);
>
> len = read(fd, buffer, sizeof(buffer)-1);
> close(fd);
> @@ -435,7 +435,7 @@ static int resolve_gitlink_ref_recursive(char *name, int pathlen,
> buffer[len] = 0;
>
> /* Was it a detached head or an old-fashioned symlink? */
> - if (!get_sha1_hex(buffer, result))
> + if (!get_sha1_hex(buffer, sha1))
> return 0;
>
> /* Symref? */
> @@ -445,10 +445,10 @@ static int resolve_gitlink_ref_recursive(char *name, int pathlen,
> while (isspace(*p))
> p++;
>
> - return resolve_gitlink_ref_recursive(name, pathlen, p, result, recursion+1);
> + return resolve_gitlink_ref_recursive(name, pathlen, p, sha1, recursion+1);
> }
>
> -int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *result)
> +int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1)
> {
> int len = strlen(path), retval;
> char *gitdir;
> @@ -472,7 +472,7 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re
> }
> gitdir[len] = '/';
> gitdir[++len] = '\0';
> - retval = resolve_gitlink_ref_recursive(gitdir, len, refname, result, 0);
> + retval = resolve_gitlink_ref_recursive(gitdir, len, refname, sha1, 0);
> free(gitdir);
> return retval;
> }
> diff --git a/refs.h b/refs.h
> index 13e2aa3..c6b8749 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -133,7 +133,7 @@ extern char *shorten_unambiguous_ref(const char *refname, int strict);
> extern int rename_ref(const char *oldref, const char *newref, const char *logmsg);
>
> /** resolve ref in nested "gitlink" repository */
> -extern int resolve_gitlink_ref(const char *name, const char *refname, unsigned char *result);
> +extern int resolve_gitlink_ref(const char *name, const char *refname, unsigned char *sha1);
>
> /** lock a ref and then write its file */
> enum action_on_err { MSG_ON_ERR, DIE_ON_ERR, QUIET_ON_ERR };