Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
75eb97fe
Commit
75eb97fe
authored
May 18, 2011
by
Jakob Pfender
Committed by
Vicent Marti
May 23, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
object.c: Move to new error handling mechanism
parent
0be7f000
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
src/object.c
+6
-6
No files found.
src/object.c
View file @
75eb97fe
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment