diff options
| author | Russell Belfer <rb@github.com> | 2013-12-06 15:53:26 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-12-11 10:57:50 -0800 |
| commit | f10d7a368fa4af28b1e6f082349ffa4f62b3c00e (patch) | |
| tree | bcb842ae95a85002de6508b882ff9668b52166cd /src/refs.c | |
| parent | c7b3e1b32040d05f3cb996d754a28af3b4d06d0b (diff) | |
| download | libgit2-f10d7a368fa4af28b1e6f082349ffa4f62b3c00e.tar.gz | |
Further callback error check style fixes
Okay, I've decided I like the readability of this style much
better so I used it everywhere.
Diffstat (limited to 'src/refs.c')
| -rw-r--r-- | src/refs.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/refs.c b/src/refs.c index afb067986..25037cc4f 100644 --- a/src/refs.c +++ b/src/refs.c @@ -516,9 +516,12 @@ int git_reference_foreach( if ((error = git_reference_iterator_new(&iter, repo)) < 0) return error; - while (!(error = git_reference_next(&ref, iter)) && - !(error = GITERR_CALLBACK( callback(ref, payload) ))) - /* callback on each reference */; + while (!(error = git_reference_next(&ref, iter))) { + if ((error = callback(ref, payload)) != 0) { + GITERR_CALLBACK(error); + break; + } + } if (error == GIT_ITEROVER) error = 0; @@ -539,9 +542,12 @@ int git_reference_foreach_name( if ((error = git_reference_iterator_new(&iter, repo)) < 0) return error; - while (!(error = git_reference_next_name(&refname, iter)) && - !(error = GITERR_CALLBACK( callback(refname, payload) ))) - /* callback on each reference name */; + while (!(error = git_reference_next_name(&refname, iter))) { + if ((error = callback(refname, payload)) != 0) { + GITERR_CALLBACK(error); + break; + } + } if (error == GIT_ITEROVER) error = 0; @@ -563,9 +569,12 @@ int git_reference_foreach_glob( if ((error = git_reference_iterator_glob_new(&iter, repo, glob)) < 0) return error; - while (!(error = git_reference_next_name(&refname, iter)) && - !(error = GITERR_CALLBACK( callback(refname, payload) ))) - /* callback on each matching reference name */; + while (!(error = git_reference_next_name(&refname, iter))) { + if ((error = callback(refname, payload)) != 0) { + GITERR_CALLBACK(error); + break; + } + } if (error == GIT_ITEROVER) error = 0; |