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

index-pack: a miniscule refactor

Browse Source 
Introduce a helper function that takes the type of an object and
tell if it is a delta, as we seem to use this check in many places.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-06-03 15:32:14 -07:00
parent 3c9fc074c2
commit 4f8ec74efa
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/index-pack.c
View File

@ -498,12 +498,17 @@ static void sha1_object(const void *data, unsigned long size,
} }
} }
static int is_delta_type(enum object_type type)
{
return (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA);
}
static void *get_base_data(struct base_data *c) static void *get_base_data(struct base_data *c)
{ {
if (!c->data) { if (!c->data) {
struct object_entry *obj = c->obj; struct object_entry *obj = c->obj;
if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA) { if (is_delta_type(obj->type)) {
void *base = get_base_data(c->base); void *base = get_base_data(c->base);
void *raw = get_data_from_pack(obj); void *raw = get_data_from_pack(obj);
c->data = patch_delta( c->data = patch_delta(
@ -629,7 +634,7 @@ static void parse_pack_objects(unsigned char *sha1)
struct object_entry *obj = &objects[i]; struct object_entry *obj = &objects[i];
void *data = unpack_raw_entry(obj, &delta->base); void *data = unpack_raw_entry(obj, &delta->base);
obj->real_type = obj->type; obj->real_type = obj->type;
if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA) { if (is_delta_type(obj->type)) {
nr_deltas++; nr_deltas++;
delta->obj_no = i; delta->obj_no = i;
delta++; delta++;
@ -676,7 +681,7 @@ static void parse_pack_objects(unsigned char *sha1)
struct object_entry *obj = &objects[i]; struct object_entry *obj = &objects[i];
struct base_data base_obj; struct base_data base_obj;
if (obj->type == OBJ_REF_DELTA || obj->type == OBJ_OFS_DELTA) if (is_delta_type(obj->type))
continue; continue;
base_obj.obj = obj; base_obj.obj = obj;
base_obj.data = NULL; base_obj.data = NULL;