refs: rename parameters result -> sha1
Try consistently to use the name "sha1" for parameters to which a SHA1 will be stored. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Dec 12, 2011 at 06:38 UTC
85be1fe34ab6bf67d232b1deb524c4af34d87222
2 files changed
+11
-11
refs.c
+10
-10
@@ -402,7 +402,7 @@ static struct ref_array *get_loose_refs(const char *submodule)
402
* the packed-refs file for the submodule.
403
*/
404
static int resolve_gitlink_packed_ref(char *name, int pathlen,
405
- const char *refname, unsigned char *result)
405
+ const char *refname, unsigned char *sha1)
406
{
407
int retval = -1;
408
struct ref_entry *ref;
@@ -415,14 +415,14 @@ static int resolve_gitlink_packed_ref(char *name, int pathlen,
415
array = get_packed_refs(name);
416
ref = search_ref_array(array, refname);
417
if (ref != NULL) {
418
- memcpy(result, ref->sha1, 20);
418
+ memcpy(sha1, ref->sha1, 20);
419
retval = 0;
420
}
421
return retval;
422
}
423
424
static int resolve_gitlink_ref_recursive(char *name, int pathlen,
425
- const char *refname, unsigned char *result,
425
+ const char *refname, unsigned char *sha1,
426
int recursion)
427
{
428
int fd, len = strlen(refname);
@@ -433,7 +433,7 @@ static int resolve_gitlink_ref_recursive(char *name, int pathlen,
433
memcpy(name + pathlen, refname, len+1);
434
fd = open(name, O_RDONLY);
435
if (fd < 0)
436
- return resolve_gitlink_packed_ref(name, pathlen, refname, result);
436
+ return resolve_gitlink_packed_ref(name, pathlen, refname, sha1);
437
438
len = read(fd, buffer, sizeof(buffer)-1);
439
close(fd);
@@ -444,7 +444,7 @@ static int resolve_gitlink_ref_recursive(char *name, int pathlen,
444
buffer[len] = 0;
445
446
/* Was it a detached head or an old-fashioned symlink? */
447
- if (!get_sha1_hex(buffer, result))
447
+ if (!get_sha1_hex(buffer, sha1))
448
return 0;
449
450
/* Symref? */
@@ -454,10 +454,10 @@ static int resolve_gitlink_ref_recursive(char *name, int pathlen,
454
while (isspace(*p))
455
p++;
456
457
- return resolve_gitlink_ref_recursive(name, pathlen, p, result, recursion+1);
457
+ return resolve_gitlink_ref_recursive(name, pathlen, p, sha1, recursion+1);
458
}
459
460
-int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *result)
460
+int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1)
461
{
462
int len = strlen(path), retval;
463
char *gitdir;
@@ -481,7 +481,7 @@ int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *re
481
}
482
gitdir[len] = '/';
483
gitdir[++len] = '\0';
484
- retval = resolve_gitlink_ref_recursive(gitdir, len, refname, result, 0);
484
+ retval = resolve_gitlink_ref_recursive(gitdir, len, refname, sha1, 0);
485
free(gitdir);
486
return retval;
487
}
@@ -647,13 +647,13 @@ static int do_one_ref(const char *base, each_ref_fn fn, int trim,
647
return fn(entry->name + trim, entry->sha1, entry->flag, cb_data);
648
}
649
650
-static int filter_refs(const char *refname, const unsigned char *sha, int flags,
650
+static int filter_refs(const char *refname, const unsigned char *sha1, int flags,
651
void *data)
652
{
653
struct ref_filter *filter = (struct ref_filter *)data;
654
if (fnmatch(filter->pattern, refname, 0))
655
return 0;
656
- return filter->fn(refname, sha, flags, filter->cb_data);
656
+ return filter->fn(refname, sha1, flags, filter->cb_data);
657
}
658
659
int peel_ref(const char *refname, unsigned char *sha1)
refs.h
+1
-1
@@ -134,7 +134,7 @@ extern char *shorten_unambiguous_ref(const char *refname, int strict);
134
extern int rename_ref(const char *oldref, const char *newref, const char *logmsg);
135
136
/** resolve ref in nested "gitlink" repository */
137
-extern int resolve_gitlink_ref(const char *name, const char *refname, unsigned char *result);
137
+extern int resolve_gitlink_ref(const char *name, const char *refname, unsigned char *sha1);
138
139
/** lock a ref and then write its file */
140
enum action_on_err { MSG_ON_ERR, DIE_ON_ERR, QUIET_ON_ERR };