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

Some callback error check style cleanups

Browse Source 
I find this easier to read...
This commit is contained in:
Russell Belfer 2013-12-06 15:42:20 -08:00
parent 60058018dc
commit c7b3e1b320
12 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/attr.c
View File

@ -191,10 +191,11 @@ int git_attr_foreach(
if (error < 0)
goto cleanup;
error = GITERR_CALLBACK(
callback(assign->name, assign->value, payload) );
if (error)
error = callback(assign->name, assign->value, payload);
if (error) {
GITERR_CALLBACK(error);
goto cleanup;
}
}
}
}

4
src/diff.c
View File

@ -1388,8 +1388,10 @@ int git_diff__paired_foreach(
i++; j++;
}
if ((error = GITERR_CALLBACK( cb(h2i, i2w, payload) )) != 0)
if ((error = cb(h2i, i2w, payload)) != 0) {
GITERR_CALLBACK(error);
break;
}
}
/* restore case-insensitive delta sort */

11
src/fetchhead.c
View File

@ -260,8 +260,8 @@ int git_repository_fetchhead_foreach(git_repository *repo,
while ((line = git__strsep(&buffer, "\n")) != NULL) {
++line_num;
if ((error = fetchhead_ref_parse(&oid, &is_merge, &name, &remote_url,
line, line_num)) < 0)
if ((error = fetchhead_ref_parse(
&oid, &is_merge, &name, &remote_url, line, line_num)) < 0)
goto done;
if (git_buf_len(&name) > 0)
@ -269,10 +269,11 @@ int git_repository_fetchhead_foreach(git_repository *repo,
else
ref_name = NULL;
error = GITERR_CALLBACK(
cb(ref_name, remote_url, &oid, is_merge, payload) );
if (error)
error = cb(ref_name, remote_url, &oid, is_merge, payload);
if (error) {
GITERR_CALLBACK(error);
goto done;
}
}
if (*buffer) {

4
src/merge.c
View File

@ -287,8 +287,10 @@ int git_repository_mergehead_foreach(
if ((error = git_oid_fromstr(&oid, line)) < 0)
goto cleanup;
if ((error = GITERR_CALLBACK( cb(&oid, payload) )) != 0)
if ((error = cb(&oid, payload)) != 0) {
GITERR_CALLBACK(error);
goto cleanup;
}
++line_num;
}

7
src/pack-objects.c
View File

@ -229,9 +229,12 @@ int git_packbuilder_insert(git_packbuilder *pb, const git_oid *oid,
if (elapsed >= MIN_PROGRESS_UPDATE_INTERVAL) {
pb->last_progress_report_time = current_time;
return GITERR_CALLBACK( pb->progress_cb(
ret = pb->progress_cb(
GIT_PACKBUILDER_ADDING_OBJECTS,
pb->nr_objects, 0, pb->progress_cb_payload) );
pb->nr_objects, 0, pb->progress_cb_payload);
if (ret)
return GITERR_CALLBACK(ret);
}
}

4
src/pack.c
View File

@ -1088,8 +1088,10 @@ int git_pack_foreach_entry(
}
for (i = 0; i < p->num_objects; i++)
if ((error = GITERR_CALLBACK( cb(p->oids[i], data) )) != 0)
if ((error = cb(p->oids[i], data)) != 0) {
GITERR_CALLBACK(error);
break;
}
return error;
}

13
src/path.c
View File

@ -434,10 +434,13 @@ int git_path_walk_up(
iter.asize = path->asize;
while (scan >= stop) {
error = GITERR_CALLBACK( cb(data, &iter) );
error = cb(data, &iter);
iter.ptr[scan] = oldc;
if (error)
if (error) {
GITERR_CALLBACK(error);
break;
}
scan = git_buf_rfind_next(&iter, '/');
if (scan >= 0) {
@ -874,12 +877,14 @@ int git_path_direach(
if ((error = git_buf_put(path, de_path, de_len)) < 0)
break;
error = GITERR_CALLBACK( fn(arg, path) );
error = fn(arg, path);
git_buf_truncate(path, wd_len); /* restore path */
if (error)
if (error != 0) {
GITERR_CALLBACK(error);
break;
}
}
closedir(dir);

5
src/push.c
View File

@ -659,8 +659,9 @@ int git_push_status_foreach(git_push *push,
unsigned int i;
git_vector_foreach(&push->status, i, status) {
GITERR_CHECK_ERROR(
GITERR_CALLBACK( cb(status->ref, status->msg, data) ) );
int error = cb(status->ref, status->msg, data);
if (error)
return GITERR_CALLBACK(error);
}
return 0;

6
src/remote.c
View File

@ -1348,9 +1348,11 @@ static int rename_fetch_refspecs(
if (!remote->name ||
strcmp(git_buf_cstr(&base), spec->string)) {
error = GITERR_CALLBACK( callback(spec->string, payload) );
if (error)
if ((error = callback(spec->string, payload)) != 0) {
GITERR_CALLBACK(error);
break;
}
continue;
}

14
src/stash.c
View File

@ -582,13 +582,15 @@ int git_stash_foreach(
for (i = 0; i < max; i++) {
entry = git_reflog_entry_byindex(reflog, i);
error = GITERR_CALLBACK(
callback(i,
git_reflog_entry_message(entry),
git_reflog_entry_id_new(entry),
payload) );
if (error)
error = callback(i,
git_reflog_entry_message(entry),
git_reflog_entry_id_new(entry),
payload);
if (error) {
GITERR_CALLBACK(error);
break;
}
}
cleanup:

5
src/status.c
View File

@ -392,9 +392,10 @@ int git_status_foreach_ext(
status_entry->head_to_index->old_file.path :
status_entry->index_to_workdir->old_file.path;
error = GITERR_CALLBACK( cb(path, status_entry->status, payload) );
if (error)
if ((error = cb(path, status_entry->status, payload)) != 0) {
GITERR_CALLBACK(error);
break;
}
}
git_status_list_free(status);

4
src/submodule.c
View File

@ -168,8 +168,10 @@ int git_submodule_foreach(
break;
}
if ((error = GITERR_CALLBACK(callback(sm, sm->name, payload))) != 0)
if ((error = callback(sm, sm->name, payload)) != 0) {
GITERR_CALLBACK(error);
break;
}
});
git_vector_free(&seen);