diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-05-18 13:53:38 -0700 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-05-18 13:53:38 -0700 |
| commit | 59d91979d87b8d355696a943f562eb326cee6c38 (patch) | |
| tree | 4b76f8371ecb965d3d40423166c73e22db19e272 /src/pack.c | |
| parent | 498b72eb6fdc8b34c1d52b6bb09ba8a198f86666 (diff) | |
| parent | 904b67e69fa15b7a3246e43b3d78645ffa2331f6 (diff) | |
| download | libgit2-59d91979d87b8d355696a943f562eb326cee6c38.tar.gz | |
Merge pull request #710 from libgit2/breaking-changes
Break everything before the release
Diffstat (limited to 'src/pack.c')
| -rw-r--r-- | src/pack.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pack.c b/src/pack.c index 4a6bc6ae8..0db1069de 100644 --- a/src/pack.c +++ b/src/pack.c @@ -222,7 +222,7 @@ static int packfile_unpack_header1( shift = 4; while (c & 0x80) { if (len <= used) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; if (bitsizeof(long) <= shift) { *usedp = 0; @@ -260,11 +260,11 @@ int git_packfile_unpack_header( // base = pack_window_open(p, w_curs, *curpos, &left); base = git_mwindow_open(mwf, w_curs, *curpos, 20, &left); if (base == NULL) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; ret = packfile_unpack_header1(&used, size_p, type_p, base, left); git_mwindow_close(w_curs); - if (ret == GIT_ESHORTBUFFER) + if (ret == GIT_EBUFS) return ret; else if (ret < 0) return packfile_error("header length is zero"); @@ -428,7 +428,7 @@ int packfile_unpack_compressed( if (st == Z_BUF_ERROR && in == NULL) { inflateEnd(&stream); git__free(buffer); - return GIT_ESHORTBUFFER; + return GIT_EBUFS; } *curpos += stream.next_in - in; @@ -467,7 +467,7 @@ git_off_t get_delta_base( base_info = pack_window_open(p, w_curs, *curpos, &left); /* Assumption: the only reason this would fail is because the file is too small */ if (base_info == NULL) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; /* pack_window_open() assured us we have [base_info, base_info + 20) * as a range that we can look at without walking off the * end of the mapped window. Its actually the hash size @@ -480,7 +480,7 @@ git_off_t get_delta_base( base_offset = c & 127; while (c & 128) { if (left <= used) - return GIT_ESHORTBUFFER; + return GIT_EBUFS; base_offset += 1; if (!base_offset || MSB(base_offset, 7)) return 0; /* overflow */ |