diff options
| author | Russell Belfer <rb@github.com> | 2013-12-04 21:22:57 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-12-11 10:57:49 -0800 |
| commit | dab89f9b6821b67dd07c8bd4dbb53e25a3e687c7 (patch) | |
| tree | c7f4f4738dfb249b7534635226128d2e20dac6a5 /src/pack.c | |
| parent | 96869a4edb2872934e0e167a726ab240f4270fea (diff) | |
| download | libgit2-dab89f9b6821b67dd07c8bd4dbb53e25a3e687c7.tar.gz | |
Further EUSER and error propagation fixes
This continues auditing all the places where GIT_EUSER is being
returned and making sure to clear any existing error using the
new giterr_user_cancel helper. As a result, places that relied
on intercepting GIT_EUSER but having the old error preserved also
needed to be cleaned up to correctly stash and then retrieve the
actual error.
Additionally, as I encountered places where error codes were not
being propagated correctly, I tried to fix them up. A number of
those fixes are included in the this commit as well.
Diffstat (limited to 'src/pack.c')
| -rw-r--r-- | src/pack.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/pack.c b/src/pack.c index 644b2d465..f69fe85e8 100644 --- a/src/pack.c +++ b/src/pack.c @@ -1042,10 +1042,9 @@ int git_pack_foreach_entry( { const unsigned char *index = p->index_map.data, *current; uint32_t i; + int error = 0; if (index == NULL) { - int error; - if ((error = pack_index_open(p)) < 0) return error; @@ -1062,7 +1061,6 @@ int git_pack_foreach_entry( if (p->oids == NULL) { git_vector offsets, oids; - int error; if ((error = git_vector_init(&oids, p->num_objects, NULL))) return error; @@ -1090,7 +1088,7 @@ int git_pack_foreach_entry( for (i = 0; i < p->num_objects; i++) if (cb(p->oids[i], data)) - return GIT_EUSER; + return giterr_user_cancel(); return 0; } |