summaryrefslogtreecommitdiff
path: root/pack-write.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-12-21 14:13:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-26 19:50:20 (GMT)
commit9af270e8c2a02afd9a3262a2c9312ee7fefbb7a3 (patch)
treecb64ac3da277efb553994e4d9fda5bad1acfbec1 /pack-write.c
parent7794a680e63a2a11b73cb1194653662f2769a792 (diff)
downloadgit-9af270e8c2a02afd9a3262a2c9312ee7fefbb7a3.zip
git-9af270e8c2a02afd9a3262a2c9312ee7fefbb7a3.tar.gz
git-9af270e8c2a02afd9a3262a2c9312ee7fefbb7a3.tar.bz2
do not pretend sha1write returns errors
The sha1write function returns an int, but it will always be "0". The failure-prone parts of the function happen in the "flush" callback, which cannot pass an error back to us. So we just end up calling die() during the flush. Let's just drop the return value altogether, as it only confuses callers into thinking that it might be useful. Only one call site actually checked the return value. We can drop that check, since it just led to a die() anyway. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-write.c')
-rw-r--r--pack-write.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/pack-write.c b/pack-write.c
index ca9e63b..676ed4c 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -189,8 +189,7 @@ off_t write_pack_header(struct sha1file *f, uint32_t nr_entries)
hdr.hdr_signature = htonl(PACK_SIGNATURE);
hdr.hdr_version = htonl(PACK_VERSION);
hdr.hdr_entries = htonl(nr_entries);
- if (sha1write(f, &hdr, sizeof(hdr)))
- return 0;
+ sha1write(f, &hdr, sizeof(hdr));
return sizeof(hdr);
}