diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-18 11:50:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-03 10:24:15 -0700 |
| commit | 1b27c2f01af398706acf554794644daaf6bc8835 (patch) | |
| tree | b033dd3ca20be016afb4df51dbad267aac6d694a /sha1_name.c | |
| parent | 274ac009f4613a14d2114259e40c6b523d9b7160 (diff) | |
| download | git-1b27c2f01af398706acf554794644daaf6bc8835.tar.gz | |
sha1_name.c: rename "now" to "current"
This variable points at the element we are currently looking at, and
does not have anything to do with the current time which the name
"now" implies.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sha1_name.c b/sha1_name.c index 9bb657deb3..c5c4591f98 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -93,11 +93,11 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne last = num; while (first < last) { uint32_t mid = (first + last) / 2; - const unsigned char *now; + const unsigned char *current; int cmp; - now = nth_packed_object_sha1(p, mid); - cmp = hashcmp(match, now); + current = nth_packed_object_sha1(p, mid); + cmp = hashcmp(match, current); if (!cmp) { first = mid; break; @@ -109,17 +109,17 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne last = mid; } if (first < num) { - const unsigned char *now, *next; - now = nth_packed_object_sha1(p, first); - if (match_sha(len, match, now)) { + const unsigned char *current, *next; + current = nth_packed_object_sha1(p, first); + if (match_sha(len, match, current)) { next = nth_packed_object_sha1(p, first+1); if (!next|| !match_sha(len, match, next)) { /* unique within this pack */ if (!found) { - found_sha1 = now; + found_sha1 = current; found++; } - else if (hashcmp(found_sha1, now)) { + else if (hashcmp(found_sha1, current)) { found = 2; break; } |