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

Further callback error check style fixes

Browse Source 
Okay, I've decided I like the readability of this style much
better so I used it everywhere.
This commit is contained in:
Russell Belfer 2013-12-06 15:53:26 -08:00
parent c7b3e1b320
commit f10d7a368f
3 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/config.c
View File

@ -507,9 +507,10 @@ int git_config_backend_foreach_match(
continue; continue;
/* abort iterator on non-zero return value */ /* abort iterator on non-zero return value */
error = GITERR_CALLBACK( cb(entry, payload) ); if ((error = cb(entry, payload)) != 0) {
if (error) GITERR_CALLBACK(error);
break; break;
}
} }
if (regexp != NULL) if (regexp != NULL)
@ -533,9 +534,12 @@ int git_config_foreach_match(
if ((error = git_config_iterator_glob_new(&iter, cfg, regexp)) < 0) if ((error = git_config_iterator_glob_new(&iter, cfg, regexp)) < 0)
return error; return error;
while (!(error = git_config_next(&entry, iter)) && while (!(error = git_config_next(&entry, iter))) {
!(error = GITERR_CALLBACK( cb(entry, payload) ))) if ((error = cb(entry, payload)) != 0) {
/* make callback on each config */; GITERR_CALLBACK(error);
break;
}
}
git_config_iterator_free(iter); git_config_iterator_free(iter);
@ -794,8 +798,10 @@ int git_config_get_multivar_foreach(
while ((err = iter->next(&entry, iter)) == 0) { while ((err = iter->next(&entry, iter)) == 0) {
found = 1; found = 1;
if ((err = GITERR_CALLBACK( cb(entry, payload) )) != 0) if ((err = cb(entry, payload)) != 0) {
GITERR_CALLBACK(err);
break; break;
}
} }
iter->free(iter); iter->free(iter);

10
src/notes.c
View File

@ -582,10 +582,12 @@ int git_note_foreach(
if ((error = git_note_iterator_new(&iter, repo, notes_ref)) < 0) if ((error = git_note_iterator_new(&iter, repo, notes_ref)) < 0)
return error; return error;
while (!(error = git_note_next(&note_id, &annotated_id, iter)) && while (!(error = git_note_next(&note_id, &annotated_id, iter))) {
!(error = GITERR_CALLBACK( if ((error = note_cb(&note_id, &annotated_id, payload)) != 0) {
note_cb(&note_id, &annotated_id, payload)))) GITERR_CALLBACK(error);
/* callback for each note */; break;
}
}
if (error == GIT_ITEROVER) if (error == GIT_ITEROVER)
error = 0; error = 0;

27
src/refs.c
View File

@ -516,9 +516,12 @@ int git_reference_foreach(
if ((error = git_reference_iterator_new(&iter, repo)) < 0) if ((error = git_reference_iterator_new(&iter, repo)) < 0)
return error; return error;
while (!(error = git_reference_next(&ref, iter)) && while (!(error = git_reference_next(&ref, iter))) {
!(error = GITERR_CALLBACK( callback(ref, payload) ))) if ((error = callback(ref, payload)) != 0) {
/* callback on each reference */; GITERR_CALLBACK(error);
break;
}
}
if (error == GIT_ITEROVER) if (error == GIT_ITEROVER)
error = 0; error = 0;
@ -539,9 +542,12 @@ int git_reference_foreach_name(
if ((error = git_reference_iterator_new(&iter, repo)) < 0) if ((error = git_reference_iterator_new(&iter, repo)) < 0)
return error; return error;
while (!(error = git_reference_next_name(&refname, iter)) && while (!(error = git_reference_next_name(&refname, iter))) {
!(error = GITERR_CALLBACK( callback(refname, payload) ))) if ((error = callback(refname, payload)) != 0) {
/* callback on each reference name */; GITERR_CALLBACK(error);
break;
}
}
if (error == GIT_ITEROVER) if (error == GIT_ITEROVER)
error = 0; error = 0;
@ -563,9 +569,12 @@ int git_reference_foreach_glob(
if ((error = git_reference_iterator_glob_new(&iter, repo, glob)) < 0) if ((error = git_reference_iterator_glob_new(&iter, repo, glob)) < 0)
return error; return error;
while (!(error = git_reference_next_name(&refname, iter)) && while (!(error = git_reference_next_name(&refname, iter))) {
!(error = GITERR_CALLBACK( callback(refname, payload) ))) if ((error = callback(refname, payload)) != 0) {
/* callback on each matching reference name */; GITERR_CALLBACK(error);
break;
}
}
if (error == GIT_ITEROVER) if (error == GIT_ITEROVER)
error = 0; error = 0;