notes: Cleanup error handling
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/src/notes.c b/src/notes.c
index e533478..4afdac0 100644
--- a/src/notes.c
+++ b/src/notes.c
@@ -265,7 +265,7 @@ static int note_remove(git_repository *repo,
static int note_get_default_ref(const char **out, git_repository *repo)
{
- int error;
+ int ret;
git_config *cfg;
*out = NULL;
@@ -273,13 +273,13 @@ static int note_get_default_ref(const char **out, git_repository *repo)
if (git_repository_config__weakptr(&cfg, repo) < 0)
return -1;
- error = git_config_get_string(cfg, "core.notesRef", out);
- if (error == GIT_ENOTFOUND) {
+ ret = git_config_get_string(cfg, "core.notesRef", out);
+ if (ret == GIT_ENOTFOUND) {
*out = GIT_NOTES_DEFAULT_REF;
return 0;
}
- return error;
+ return ret;
}
int git_note_read(git_note **out, git_repository *repo,
@@ -293,11 +293,8 @@ int git_note_read(git_note **out, git_repository *repo,
*out = NULL;
- if (!notes_ref) {
- error = note_get_default_ref(¬es_ref, repo);
- if (error < 0)
- return error;
- }
+ if (!notes_ref && note_get_default_ref(¬es_ref, repo) < 0)
+ return -1;
error = git_reference_lookup(&ref, repo, notes_ref);
if (error < 0)
@@ -337,11 +334,8 @@ int git_note_create(
git_commit *commit = NULL;
git_reference *ref;
- if (!notes_ref) {
- error = note_get_default_ref(¬es_ref, repo);
- if (error < 0)
- return error;
- }
+ if (!notes_ref && note_get_default_ref(¬es_ref, repo) < 0)
+ return -1;
error = git_reference_lookup(&ref, repo, notes_ref);
if (error < 0 && error != GIT_ENOTFOUND)
@@ -385,11 +379,9 @@ int git_note_remove(git_repository *repo, const char *notes_ref,
git_commit *commit;
git_reference *ref;
- if (!notes_ref) {
- error = note_get_default_ref(¬es_ref, repo);
- if (error < 0)
- return error;
- }
+
+ if (!notes_ref && note_get_default_ref(¬es_ref, repo) < 0)
+ return -1;
error = git_reference_lookup(&ref, repo, notes_ref);
if (error < 0)