summaryrefslogtreecommitdiff
path: root/src/pack-objects.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-12-06 15:42:20 -0800
committerRussell Belfer <rb@github.com>2013-12-11 10:57:50 -0800
commitc7b3e1b32040d05f3cb996d754a28af3b4d06d0b (patch)
treec2cb268aeb8b8dc244970034d1d220867c6ed62b /src/pack-objects.c
parent60058018dcadbaa1f70281c9d29faf1e46d3a87c (diff)
downloadlibgit2-c7b3e1b32040d05f3cb996d754a28af3b4d06d0b.tar.gz
Some callback error check style cleanups
I find this easier to read...
Diffstat (limited to 'src/pack-objects.c')
-rw-r--r--src/pack-objects.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pack-objects.c b/src/pack-objects.c
index 2f0007f4f..09b7248af 100644
--- a/src/pack-objects.c
+++ b/src/pack-objects.c
@@ -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);
}
}