proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-06 04:41:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved error handling on auxilirary functions.

Browse Source 
Signed-off-by: Vicent Marti <tanoku@gmail.com>
Signed-off-by: Andreas Ericsson <ae@op5.se>
This commit is contained in:
Vicent Marti 2010-05-28 02:02:02 +02:00 committed by Andreas Ericsson
parent c2550609e3
commit de141d4bb9
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/commit.c
View File

@ -75,27 +75,27 @@ error_cleanup:
int git_commit_parse_existing(git_commit *commit) int git_commit_parse_existing(git_commit *commit)
{ {
int error = 0;
git_obj commit_obj; git_obj commit_obj;
if (commit->parsed) if (commit->parsed)
return 0; return 0;
if (git_odb_read(&commit_obj, commit->object.pool->db, &commit->object.id) < 0) error = git_odb_read(&commit_obj, commit->object.pool->db, &commit->object.id);
return GIT_ENOTFOUND; if (error < 0)
return error;
if (commit_obj.type != GIT_OBJ_COMMIT) if (commit_obj.type != GIT_OBJ_COMMIT)
goto error_cleanup; {
error = GIT_EOBJTYPE;
goto cleanup;
}
if (git_commit__parse_buffer(commit, commit_obj.data, commit_obj.len) < 0) error = git_commit__parse_buffer(commit, commit_obj.data, commit_obj.len);
goto error_cleanup;
cleanup:
git_obj_close(&commit_obj); git_obj_close(&commit_obj);
return error;
return 0;
error_cleanup:
git_obj_close(&commit_obj);
return -1;
} }
git_commit *git_commit_lookup(git_revpool *pool, const git_oid *id) git_commit *git_commit_lookup(git_revpool *pool, const git_oid *id)
@ -205,7 +205,8 @@ int git_commit__parse_buffer(git_commit *commit, void *data, size_t len)
if (commit->uninteresting) if (commit->uninteresting)
parent->uninteresting = 1; parent->uninteresting = 1;
git_commit_list_push_back(&commit->parents, parent); if (git_commit_list_push_back(&commit->parents, parent))
return GIT_ENOMEM;
} }
if (git_commit__parse_time(&commit->commit_time, buffer, buffer_end) < 0) if (git_commit__parse_time(&commit->commit_time, buffer, buffer_end) < 0)

4
src/revobject.c
View File

@ -74,14 +74,14 @@ int git_revpool_table_insert(git_revpool_table *table, git_revpool_object *objec
unsigned int index, hash; unsigned int index, hash;
if (table == NULL) if (table == NULL)
return -1; return GIT_ERROR;
if (table->count + 1 > table->max_count) if (table->count + 1 > table->max_count)
git_revpool_table_resize(table); git_revpool_table_resize(table);
node = git__malloc(sizeof(git_revpool_node)); node = git__malloc(sizeof(git_revpool_node));
if (node == NULL) if (node == NULL)
return -1; return GIT_ENOMEM;
hash = git_revpool_table__hash(&object->id); hash = git_revpool_table__hash(&object->id);
index = (hash & table->size_mask); index = (hash & table->size_mask);

10
src/revwalk.c
View File

@ -71,8 +71,9 @@ int gitrp_push(git_revpool *pool, git_commit *commit)
return GIT_ERROR; return GIT_ERROR;
if (!commit->parsed) { if (!commit->parsed) {
if (git_commit_parse_existing(commit) < 0) int error = git_commit_parse_existing(commit);
return GIT_EOBJCORRUPTED; if (error < 0)
return error;
} }
// Sanity check: make sure that if the commit // Sanity check: make sure that if the commit
@ -105,8 +106,9 @@ int gitrp__enroot(git_revpool *pool, git_commit *commit)
return 0; return 0;
if (commit->parsed == 0) { if (commit->parsed == 0) {
if (git_commit_parse_existing(commit)) error = git_commit_parse_existing(commit);
return GIT_EOBJCORRUPTED; if (error < 0)
return error;
} }
commit->seen = 1; commit->seen = 1;