bitmap_position_packfile(): convert to new revindex API

ttaylorr · gitster · commit 57665086af39 · 2021-01-13T21:53:45.000-08:00
Replace find_revindex_position() with its counterpart in the new API,
offset_to_pack_pos().

Signed-off-by: Taylor Blau &lt;me@ttaylorr.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/pack-bitmap.c b/pack-bitmap.c
@@ -407,11 +407,14 @@ static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,
 static inline int bitmap_position_packfile(struct bitmap_index *bitmap_git,
 					   const struct object_id *oid)
 {
+	uint32_t pos;
 	off_t offset = find_pack_entry_one(oid->hash, bitmap_git->pack);
 	if (!offset)
 		return -1;
 
-	return find_revindex_position(bitmap_git->pack, offset);
+	if (offset_to_pack_pos(bitmap_git->pack, offset, &pos) < 0)
+		return -1;
+	return pos;
 }
 
 static int bitmap_position(struct bitmap_index *bitmap_git,

Original file line number	Diff line number	Diff line change
`@@ -407,11 +407,14 @@ static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,`
`407`	`407`	`static inline int bitmap_position_packfile(struct bitmap_index *bitmap_git,`
`408`	`408`	`const struct object_id *oid)`
`409`	`409`	`{`
	`410`	`+ uint32_t pos;`
`410`	`411`	`off_t offset = find_pack_entry_one(oid->hash, bitmap_git->pack);`
`411`	`412`	`if (!offset)`
`412`	`413`	`return -1;`
`413`	`414`
`414`		`- return find_revindex_position(bitmap_git->pack, offset);`
	`415`	`+ if (offset_to_pack_pos(bitmap_git->pack, offset, &pos) < 0)`
	`416`	`+ return -1;`
	`417`	`+ return pos;`
`415`	`418`	`}`
`416`	`419`
`417`	`420`	`static int bitmap_position(struct bitmap_index *bitmap_git,`