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>
This commit is contained in:
Junio C Hamano 2012-06-18 11:50:36 -07:00
Родитель 274ac009f4
Коммит 1b27c2f01a
1 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -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;
}