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

object.c: Move to new error handling mechanism

Browse Source
This commit is contained in:
Jakob Pfender 2011-05-18 12:19:48 +02:00 committed by Vicent Marti
parent 0be7f000a5
commit 75eb97fed0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/object.c
View File

@ -86,7 +86,7 @@ static int create_object(git_object **object_out, git_otype type)
break;
default:
return GIT_EINVALIDTYPE;
return git__throw(GIT_EINVALIDTYPE, "Failed to create object. Given type is invalid");
}
object->type = type;
@ -106,7 +106,7 @@ int git_object_lookup(git_object **object_out, git_repository *repo, const git_o
object = git_cache_get(&repo->objects, id);
if (object != NULL) {
if (type != GIT_OBJ_ANY && type != object->type)
return GIT_EINVALIDTYPE;
return git__throw(GIT_EINVALIDTYPE, "Failed to lookup object. Given type does not match found type");
*object_out = object;
return GIT_SUCCESS;
@ -114,17 +114,17 @@ int git_object_lookup(git_object **object_out, git_repository *repo, const git_o
error = git_odb_read(&odb_obj, repo->db, id);
if (error < GIT_SUCCESS)
return error;
return git__rethrow(error, "Failed to lookup object");
if (type != GIT_OBJ_ANY && type != odb_obj->raw.type) {
git_odb_object_close(odb_obj);
return GIT_EINVALIDTYPE;
return git__throw(GIT_EINVALIDTYPE, "Failed to lookup object. Given type does not match found type");
}
type = odb_obj->raw.type;
if ((error = create_object(&object, type)) < GIT_SUCCESS)
return error;
return git__rethrow(error, "Failed to lookup object");
/* Initialize parent object */
git_oid_cpy(&object->cached.oid, id);
@ -155,7 +155,7 @@ int git_object_lookup(git_object **object_out, git_repository *repo, const git_o
if (error < GIT_SUCCESS) {
git_object__free(object);
return error;
return git__rethrow(error, "Failed to lookup object");
}
*object_out = git_cache_try_store(&repo->objects, object);