undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up add_object_entry()

Browse Source 
This function used to call locate_object_entry_hash() _twice_ per added
object while only once should suffice. Let's reorganize that code a bit.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Nicolas Pitre 2007-04-10 22:54:36 -04:00 committed by Junio C Hamano
parent 6e5417769c
commit 29b734e478
1 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
builtin-pack-objects.c
View File

@ -781,12 +781,19 @@ static unsigned name_hash(const char *name)
static int add_object_entry(const unsigned char *sha1, unsigned hash, int exclude) static int add_object_entry(const unsigned char *sha1, unsigned hash, int exclude)
{ {
uint32_t idx = nr_objects;
struct object_entry *entry; struct object_entry *entry;
struct packed_git *p; struct packed_git *p, *found_pack = NULL;
off_t found_offset = 0; off_t found_offset = 0;
struct packed_git *found_pack = NULL; int ix;
int ix, status = 0;
ix = nr_objects ? locate_object_entry_hash(sha1) : -1;
if (ix >= 0) {
if (exclude) {
entry = objects + object_ix[ix] - 1;
entry->preferred_base = 1;
}
return 0;
}
if (!exclude) { if (!exclude) {
for (p = packed_git; p; p = p->next) { for (p = packed_git; p; p = p->next) {
@ -803,43 +810,34 @@ static int add_object_entry(const unsigned char *sha1, unsigned hash, int exclud
} }
} }
} }
if ((entry = locate_object_entry(sha1)) != NULL)
goto already_added;
if (idx >= nr_alloc) { if (nr_objects >= nr_alloc) {
nr_alloc = (idx + 1024) * 3 / 2; nr_alloc = (nr_alloc + 1024) * 3 / 2;
objects = xrealloc(objects, nr_alloc * sizeof(*entry)); objects = xrealloc(objects, nr_alloc * sizeof(*entry));
} }
entry = objects + idx;
nr_objects = idx + 1; entry = objects + nr_objects++;
memset(entry, 0, sizeof(*entry)); memset(entry, 0, sizeof(*entry));
hashcpy(entry->sha1, sha1); hashcpy(entry->sha1, sha1);
entry->hash = hash; entry->hash = hash;
if (object_ix_hashsz * 3 <= nr_objects * 4)
rehash_objects();
else {
ix = locate_object_entry_hash(entry->sha1);
if (0 <= ix)
die("internal error in object hashing.");
object_ix[-1 - ix] = idx + 1;
}
status = 1;
already_added:
if (progress_update) {
fprintf(stderr, "Counting objects...%u\r", nr_objects);
progress_update = 0;
}
if (exclude) if (exclude)
entry->preferred_base = 1; entry->preferred_base = 1;
else {
if (found_pack) { if (found_pack) {
entry->in_pack = found_pack; entry->in_pack = found_pack;
entry->in_pack_offset = found_offset; entry->in_pack_offset = found_offset;
} }
if (object_ix_hashsz * 3 <= nr_objects * 4)
rehash_objects();
else
object_ix[-1 - ix] = nr_objects;
if (progress_update) {
fprintf(stderr, "Counting objects...%u\r", nr_objects);
progress_update = 0;
} }
return status;
return 1;
} }
struct pbase_tree_cache { struct pbase_tree_cache {