diff options
author | Russell Belfer <rb@github.com> | 2012-05-05 03:46:46 +0400 |
---|---|---|
committer | Russell Belfer <rb@github.com> | 2012-05-05 03:46:46 +0400 |
commit | 282283acc65bab9de231a2b3dc489eb171d5f1cf (patch) | |
tree | 402e4a5699e5d2182b542e0eb2468f564951094f /src/odb_pack.c | |
parent | 3ec1fa5e1c0ee0e151a44267fa6496ecdf604eb9 (diff) |
Fix valgrind issues
There are three changes here:
- correctly propogate error code from failed object lookups
- make zlib inflate use our allocators
- add OID to notfound error in ODB lookups
Diffstat (limited to 'src/odb_pack.c')
-rw-r--r-- | src/odb_pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/odb_pack.c b/src/odb_pack.c index 242200b4a..458f288d9 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -242,7 +242,7 @@ static int packfile_refresh_all(struct pack_backend *backend) return 0; if (p_stat(backend->pack_folder, &st) < 0 || !S_ISDIR(st.st_mode)) - return git_odb__error_notfound("failed to refresh packfiles"); + return git_odb__error_notfound("failed to refresh packfiles", NULL); if (st.st_mtime != backend->pack_folder_mtime) { git_buf path = GIT_BUF_INIT; @@ -288,7 +288,7 @@ static int pack_entry_find(struct git_pack_entry *e, struct pack_backend *backen } } - return git_odb__error_notfound("failed to find pack entry"); + return git_odb__error_notfound("failed to find pack entry", oid); } static int pack_entry_find_prefix( @@ -330,7 +330,7 @@ static int pack_entry_find_prefix( } if (!found) - return git_odb__error_notfound("failed to find pack entry"); + return git_odb__error_notfound("no matching pack entry for prefix", short_oid); else if (found > 1) return git_odb__error_ambiguous("found multiple pack entries"); else |