diff options
Diffstat (limited to 'src/odb_mempack.c')
| -rw-r--r-- | src/odb_mempack.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/odb_mempack.c b/src/odb_mempack.c index 4e54735e9..1086859be 100644 --- a/src/odb_mempack.c +++ b/src/odb_mempack.c @@ -23,7 +23,7 @@ struct memobject { git_oid oid; size_t len; - git_otype type; + git_object_t type; char data[GIT_FLEX_ARRAY]; }; @@ -33,10 +33,10 @@ struct memory_packer_db { git_array_t(struct memobject *) commits; }; -static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void *data, size_t len, git_otype type) +static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void *data, size_t len, git_object_t type) { struct memory_packer_db *db = (struct memory_packer_db *)_backend; - struct memobject *obj = NULL; + struct memobject *obj = NULL; size_t pos; size_t alloc_len; int rval; @@ -60,7 +60,7 @@ static int impl__write(git_odb_backend *_backend, const git_oid *oid, const void git_oidmap_set_key_at(db->objects, pos, &obj->oid); git_oidmap_set_value_at(db->objects, pos, obj); - if (type == GIT_OBJ_COMMIT) { + if (type == GIT_OBJECT_COMMIT) { struct memobject **store = git_array_alloc(db->commits); GITERR_CHECK_ALLOC(store); *store = obj; @@ -76,7 +76,7 @@ static int impl__exists(git_odb_backend *backend, const git_oid *oid) return git_oidmap_exists(db->objects, oid); } -static int impl__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) +static int impl__read(void **buffer_p, size_t *len_p, git_object_t *type_p, git_odb_backend *backend, const git_oid *oid) { struct memory_packer_db *db = (struct memory_packer_db *)backend; struct memobject *obj = NULL; @@ -97,7 +97,7 @@ static int impl__read(void **buffer_p, size_t *len_p, git_otype *type_p, git_odb return 0; } -static int impl__read_header(size_t *len_p, git_otype *type_p, git_odb_backend *backend, const git_oid *oid) +static int impl__read_header(size_t *len_p, git_object_t *type_p, git_odb_backend *backend, const git_oid *oid) { struct memory_packer_db *db = (struct memory_packer_db *)backend; struct memobject *obj = NULL; |