pack: do not repeat the same error message four times

Repeating this error message makes it harder to find out where we
actually are finding the error, and they don't really describe what
we're trying to do.
This commit is contained in:
Carlos Martín Nieto 2014-05-06 21:21:04 +02:00
parent 86d5810b82
commit ae0817393c

View File

@ -653,7 +653,7 @@ int git_packfile_stream_open(git_packfile_stream *obj, struct git_pack_file *p,
st = inflateInit(&obj->zstream); st = inflateInit(&obj->zstream);
if (st != Z_OK) { if (st != Z_OK) {
git__free(obj); git__free(obj);
giterr_set(GITERR_ZLIB, "Failed to inflate packfile"); giterr_set(GITERR_ZLIB, "failed to init packfile stream");
return -1; return -1;
} }
@ -684,7 +684,7 @@ ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t
written = len - obj->zstream.avail_out; written = len - obj->zstream.avail_out;
if (st != Z_OK && st != Z_STREAM_END) { if (st != Z_OK && st != Z_STREAM_END) {
giterr_set(GITERR_ZLIB, "Failed to inflate packfile"); giterr_set(GITERR_ZLIB, "error reading from the zlib stream");
return -1; return -1;
} }
@ -729,7 +729,7 @@ int packfile_unpack_compressed(
st = inflateInit(&stream); st = inflateInit(&stream);
if (st != Z_OK) { if (st != Z_OK) {
git__free(buffer); git__free(buffer);
giterr_set(GITERR_ZLIB, "Failed to inflate packfile"); giterr_set(GITERR_ZLIB, "failed to init zlib stream on unpack");
return -1; return -1;
} }
@ -756,7 +756,7 @@ int packfile_unpack_compressed(
if ((st != Z_STREAM_END) || stream.total_out != size) { if ((st != Z_STREAM_END) || stream.total_out != size) {
git__free(buffer); git__free(buffer);
giterr_set(GITERR_ZLIB, "Failed to inflate packfile"); giterr_set(GITERR_ZLIB, "error inflating zlib stream");
return -1; return -1;
} }