mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
odb: rename oid_object_info()
Rename `oid_object_info()` to `odb_read_object_info()` as well as their `_extended()` variant to match other functions related to the object database and our modern coding guidelines. Introduce compatibility wrappers so that any in-flight topics will continue to compile. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
16cf749496
commit
e989dd96b8
@@ -44,7 +44,7 @@ struct git_istream {
|
||||
|
||||
union {
|
||||
struct {
|
||||
char *buf; /* from oid_object_info_extended() */
|
||||
char *buf; /* from odb_read_object_info_extended() */
|
||||
unsigned long read_ptr;
|
||||
} incore;
|
||||
|
||||
@@ -403,8 +403,8 @@ static int open_istream_incore(struct git_istream *st, struct repository *r,
|
||||
oi.typep = type;
|
||||
oi.sizep = &st->size;
|
||||
oi.contentp = (void **)&st->u.incore.buf;
|
||||
return oid_object_info_extended(r, oid, &oi,
|
||||
OBJECT_INFO_DIE_IF_CORRUPT);
|
||||
return odb_read_object_info_extended(r->objects, oid, &oi,
|
||||
OBJECT_INFO_DIE_IF_CORRUPT);
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
@@ -422,7 +422,7 @@ static int istream_source(struct git_istream *st,
|
||||
|
||||
oi.typep = type;
|
||||
oi.sizep = &size;
|
||||
status = oid_object_info_extended(r, oid, &oi, 0);
|
||||
status = odb_read_object_info_extended(r->objects, oid, &oi, 0);
|
||||
if (status < 0)
|
||||
return status;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user