kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

packfile: add repository argument to retry_bad_packed_offset 

Add a repository argument to allow the callers of retry_bad_packed_offset
to be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.

As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 2018-04-25 11:21:00 -07:00 committed by Junio C Hamano
parent 0df8e96566
commit 0df23781fe
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packfile.c
View File

@ -1104,7 +1104,9 @@ static const unsigned char *get_delta_base_sha1(struct packed_git *p,
return NULL; return NULL;
} }


static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset) #define retry_bad_packed_offset(r, p, o) \
retry_bad_packed_offset_##r(p, o)
static int retry_bad_packed_offset_the_repository(struct packed_git *p, off_t obj_offset)
{ {
int type; int type;
struct revindex_entry *revidx; struct revindex_entry *revidx;
@ -1153,7 +1155,7 @@ static enum object_type packed_to_object_type(struct packed_git *p,
if (type <= OBJ_NONE) { if (type <= OBJ_NONE) {
/* If getting the base itself fails, we first /* If getting the base itself fails, we first
* retry the base, otherwise unwind */ * retry the base, otherwise unwind */
type = retry_bad_packed_offset(p, base_offset); type = retry_bad_packed_offset(the_repository, p, base_offset);
if (type > OBJ_NONE) if (type > OBJ_NONE)
goto out; goto out;
goto unwind; goto unwind;
@ -1181,7 +1183,7 @@ out:
unwind: unwind:
while (poi_stack_nr) { while (poi_stack_nr) {
obj_offset = poi_stack[--poi_stack_nr]; obj_offset = poi_stack[--poi_stack_nr];
type = retry_bad_packed_offset(p, obj_offset); type = retry_bad_packed_offset(the_repository, p, obj_offset);
if (type > OBJ_NONE) if (type > OBJ_NONE)
goto out; goto out;
} }