diff options
| author | Ben Straub <bs@github.com> | 2012-11-29 19:59:18 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-11-30 13:12:15 -0800 |
| commit | 55f6f21b7dd5a177e2cc60c1054b438c05ed8f14 (patch) | |
| tree | 4035aacea39de443dbe855b98636d459d53670a8 /src | |
| parent | ca901e7b0fb38a7f4748ff5fcde7a2779f3a7771 (diff) | |
| download | libgit2-55f6f21b7dd5a177e2cc60c1054b438c05ed8f14.tar.gz | |
Deploy versioned git_odb_backend structure
Diffstat (limited to 'src')
| -rw-r--r-- | src/odb.c | 15 | ||||
| -rw-r--r-- | src/odb_loose.c | 1 | ||||
| -rw-r--r-- | src/odb_pack.c | 2 |
3 files changed, 18 insertions, 0 deletions
@@ -363,12 +363,27 @@ int git_odb_new(git_odb **out) 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) { backend_internal *internal; assert(odb && backend); + if (!backend_has_valid_version(backend)) + return -1; + /* Check if the backend is already owned by another ODB */ assert(!backend->odb || backend->odb == odb); diff --git a/src/odb_loose.c b/src/odb_loose.c index e2f1aec32..df86d903e 100644 --- a/src/odb_loose.c +++ b/src/odb_loose.c @@ -915,6 +915,7 @@ int git_odb_backend_loose( backend = git__calloc(1, sizeof(loose_backend)); GITERR_CHECK_ALLOC(backend); + backend->parent.version = GIT_ODB_BACKEND_VERSION; backend->objects_dir = git__strdup(objects_dir); GITERR_CHECK_ALLOC(backend->objects_dir); diff --git a/src/odb_pack.c b/src/odb_pack.c index 35bf1580d..41789e4ec 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -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)); GITERR_CHECK_ALLOC(backend); + backend->parent.version = GIT_ODB_BACKEND_VERSION; if (git_vector_init(&backend->packs, 1, NULL) < 0) 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)); GITERR_CHECK_ALLOC(backend); + backend->parent.version = GIT_ODB_BACKEND_VERSION; if (git_vector_init(&backend->packs, 8, packfile_sort__cb) < 0 || git_buf_joinpath(&path, objects_dir, "pack") < 0) |