proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 12:24:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deploy versioned git_odb_backend structure

Browse Source
This commit is contained in:
Ben Straub 2012-11-29 19:59:18 -08:00
parent ca901e7b0f
commit 55f6f21b7d
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/odb.c
View File

@ -363,12 +363,27 @@ int git_odb_new(git_odb **out)
return 0; return 0;
} }
static bool backend_has_valid_version(git_odb_backend *backend)
{
if (!backend)
return true;
if (backend->version > 0 && backend->version <= GIT_ODB_BACKEND_VERSION)
return true;
giterr_set(GITERR_INVALID, "Invalid version %d on git_odb_backend", backend->version);
return false;
}
static int add_backend_internal(git_odb *odb, git_odb_backend *backend, int priority, int is_alternate) static int add_backend_internal(git_odb *odb, git_odb_backend *backend, int priority, int is_alternate)
{ {
backend_internal *internal; backend_internal *internal;
assert(odb && backend); assert(odb && backend);
if (!backend_has_valid_version(backend))
return -1;
/* Check if the backend is already owned by another ODB */ /* Check if the backend is already owned by another ODB */
assert(!backend->odb || backend->odb == odb); assert(!backend->odb || backend->odb == odb);

1
src/odb_loose.c
View File

@ -915,6 +915,7 @@ int git_odb_backend_loose(
backend = git__calloc(1, sizeof(loose_backend)); backend = git__calloc(1, sizeof(loose_backend));
GITERR_CHECK_ALLOC(backend); GITERR_CHECK_ALLOC(backend);
backend->parent.version = GIT_ODB_BACKEND_VERSION;
backend->objects_dir = git__strdup(objects_dir); backend->objects_dir = git__strdup(objects_dir);
GITERR_CHECK_ALLOC(backend->objects_dir); GITERR_CHECK_ALLOC(backend->objects_dir);

2
src/odb_pack.c
View File

@ -570,6 +570,7 @@ int git_odb_backend_one_pack(git_odb_backend **backend_out, const char *idx)
backend = git__calloc(1, sizeof(struct pack_backend)); backend = git__calloc(1, sizeof(struct pack_backend));
GITERR_CHECK_ALLOC(backend); GITERR_CHECK_ALLOC(backend);
backend->parent.version = GIT_ODB_BACKEND_VERSION;
if (git_vector_init(&backend->packs, 1, NULL) < 0) if (git_vector_init(&backend->packs, 1, NULL) < 0)
goto on_error; goto on_error;
@ -602,6 +603,7 @@ int git_odb_backend_pack(git_odb_backend **backend_out, const char *objects_dir)
backend = git__calloc(1, sizeof(struct pack_backend)); backend = git__calloc(1, sizeof(struct pack_backend));
GITERR_CHECK_ALLOC(backend); GITERR_CHECK_ALLOC(backend);
backend->parent.version = GIT_ODB_BACKEND_VERSION;
if (git_vector_init(&backend->packs, 8, packfile_sort__cb) < 0 || if (git_vector_init(&backend->packs, 8, packfile_sort__cb) < 0 ||
git_buf_joinpath(&path, objects_dir, "pack") < 0) git_buf_joinpath(&path, objects_dir, "pack") < 0)

4
tests-clar/odb/sorting.c
View File

@ -11,11 +11,11 @@ static git_odb_backend *new_backend(int position)
{ {
fake_backend *b; fake_backend *b;
b = git__malloc(sizeof(fake_backend)); b = git__calloc(1, sizeof(fake_backend));
if (b == NULL) if (b == NULL)
return NULL; return NULL;
memset(b, 0x0, sizeof(fake_backend)); b->base.version = GIT_ODB_BACKEND_VERSION;
b->position = position; b->position = position;
return (git_odb_backend *)b; return (git_odb_backend *)b;
} }