mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-26 01:16:36 +02:00
Code

index-pack: remove redundant parameter 

find_{ref,ofs}_delta_{,children} take an enum object_type parameter, but
the object type is already present in the name of the function. Remove
that parameter from these functions.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Tan 2020-08-24 12:16:33 -07:00 committed by Junio C Hamano
parent 009be0d26d
commit fc968e26c2
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builtin/index-pack.c
View File

@ -614,7 +614,7 @@ static int compare_ofs_delta_bases(off_t offset1, off_t offset2,
0;
}
static int find_ofs_delta(const off_t offset, enum object_type type)
static int find_ofs_delta(const off_t offset)
{
int first = 0, last = nr_ofs_deltas;
@ -624,7 +624,8 @@ static int find_ofs_delta(const off_t offset, enum object_type type)
int cmp;
cmp = compare_ofs_delta_bases(offset, delta->offset,
type, objects[delta->obj_no].type);
OBJ_OFS_DELTA,
objects[delta->obj_no].type);
if (!cmp)
return next;
if (cmp < 0) {
@ -637,10 +638,9 @@ static int find_ofs_delta(const off_t offset, enum object_type type)
}
static void find_ofs_delta_children(off_t offset,
int *first_index, int *last_index,
enum object_type type)
int *first_index, int *last_index)
{
int first = find_ofs_delta(offset, type);
int first = find_ofs_delta(offset);
int last = first;
int end = nr_ofs_deltas - 1;
@ -668,7 +668,7 @@ static int compare_ref_delta_bases(const struct object_id *oid1,
return oidcmp(oid1, oid2);
}
static int find_ref_delta(const struct object_id *oid, enum object_type type)
static int find_ref_delta(const struct object_id *oid)
{
int first = 0, last = nr_ref_deltas;
@ -678,7 +678,8 @@ static int find_ref_delta(const struct object_id *oid, enum object_type type)
int cmp;
cmp = compare_ref_delta_bases(oid, &delta->oid,
type, objects[delta->obj_no].type);
OBJ_REF_DELTA,
objects[delta->obj_no].type);
if (!cmp)
return next;
if (cmp < 0) {
@ -691,10 +692,9 @@ static int find_ref_delta(const struct object_id *oid, enum object_type type)
}
static void find_ref_delta_children(const struct object_id *oid,
int *first_index, int *last_index,
enum object_type type)
int *first_index, int *last_index)
{
int first = find_ref_delta(oid, type);
int first = find_ref_delta(oid);
int last = first;
int end = nr_ref_deltas - 1;
@ -983,12 +983,10 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base,
{
if (base->ref_last == -1 && base->ofs_last == -1) {
find_ref_delta_children(&base->obj->idx.oid,
&base->ref_first, &base->ref_last,
OBJ_REF_DELTA);
&base->ref_first, &base->ref_last);
find_ofs_delta_children(base->obj->idx.offset,
&base->ofs_first, &base->ofs_last,
OBJ_OFS_DELTA);
&base->ofs_first, &base->ofs_last);
if (base->ref_last == -1 && base->ofs_last == -1) {
free(base->data);