Commit 81201a4c by nulltoken

Move cache.c to the new error handling

parent 3abe3bba
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define GIT_CACHE_OPENADR 3 #define GIT_CACHE_OPENADR 3
void git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_ptr) int git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_ptr)
{ {
size_t i; size_t i;
...@@ -51,7 +51,9 @@ void git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_p ...@@ -51,7 +51,9 @@ void git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_p
cache->lru_count = 0; cache->lru_count = 0;
cache->free_obj = free_ptr; cache->free_obj = free_ptr;
cache->nodes = git__malloc((size + 1) * sizeof(cache_node)); //TODO: How should we deal with GIT_ENOMEM? cache->nodes = git__malloc((size + 1) * sizeof(cache_node));
if (cache->nodes == NULL)
return GIT_ENOMEM;
for (i = 0; i < (size + 1); ++i) { for (i = 0; i < (size + 1); ++i) {
git_mutex_init(&cache->nodes[i].lock); git_mutex_init(&cache->nodes[i].lock);
......
...@@ -31,7 +31,7 @@ typedef struct { ...@@ -31,7 +31,7 @@ typedef struct {
} git_cache; } git_cache;
void git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_ptr); int git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_ptr);
void git_cache_free(git_cache *cache); void git_cache_free(git_cache *cache);
void *git_cache_try_store(git_cache *cache, void *entry); void *git_cache_try_store(git_cache *cache, void *entry);
......
...@@ -234,13 +234,17 @@ static int backend_sort_cmp(const void *a, const void *b) ...@@ -234,13 +234,17 @@ static int backend_sort_cmp(const void *a, const void *b)
int git_odb_new(git_odb **out) int git_odb_new(git_odb **out)
{ {
int error;
git_odb *db = git__calloc(1, sizeof(*db)); git_odb *db = git__calloc(1, sizeof(*db));
if (!db) if (!db)
return GIT_ENOMEM; return GIT_ENOMEM;
git_cache_init(&db->cache, GIT_DEFAULT_CACHE_SIZE, &free_odb_object); git_cache_init(&db->cache, GIT_DEFAULT_CACHE_SIZE, &free_odb_object);
if (error < GIT_SUCCESS)
return error;
if (git_vector_init(&db->backends, 4, backend_sort_cmp) < 0) { if (git_vector_init(&db->backends, 4, backend_sort_cmp) < GIT_SUCCESS) {
free(db); free(db);
return GIT_ENOMEM; return GIT_ENOMEM;
} }
......
...@@ -159,13 +159,19 @@ static int guess_repository_dirs(git_repository *repo, const char *repository_pa ...@@ -159,13 +159,19 @@ static int guess_repository_dirs(git_repository *repo, const char *repository_pa
static git_repository *repository_alloc() static git_repository *repository_alloc()
{ {
int error;
git_repository *repo = git__malloc(sizeof(git_repository)); git_repository *repo = git__malloc(sizeof(git_repository));
if (!repo) if (!repo)
return NULL; return NULL;
memset(repo, 0x0, sizeof(git_repository)); memset(repo, 0x0, sizeof(git_repository));
git_cache_init(&repo->objects, GIT_DEFAULT_CACHE_SIZE, &git_object__free); error = git_cache_init(&repo->objects, GIT_DEFAULT_CACHE_SIZE, &git_object__free);
if (error < GIT_SUCCESS) {
free(repo);
return NULL;
}
if (git_repository__refcache_init(&repo->references) < GIT_SUCCESS) { if (git_repository__refcache_init(&repo->references) < GIT_SUCCESS) {
free(repo); free(repo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment