Skip to content

Commit

Permalink
do not pretend sha1write returns errors
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
peff authored and gitster committed Dec 26, 2013
1 parent 7794a68 commit 9af270e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
2 changes: 0 additions & 2 deletions builtin/pack-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -737,8 +737,6 @@ static void write_pack_file(void)
f = create_tmp_packfile(&pack_tmp_name);

offset = write_pack_header(f, nr_remaining);
if (!offset)
die_errno("unable to write pack header");
nr_written = 0;
for (; i < nr_objects; i++) {
struct object_entry *e = write_order[i];
Expand Down
3 changes: 1 addition & 2 deletions csum-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags)
return fd;
}

int sha1write(struct sha1file *f, void *buf, unsigned int count)
void sha1write(struct sha1file *f, void *buf, unsigned int count)
{
while (count) {
unsigned offset = f->offset;
Expand Down Expand Up @@ -116,7 +116,6 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count)
}
f->offset = offset;
}
return 0;
}

struct sha1file *sha1fd(int fd, const char *name)
Expand Down
2 changes: 1 addition & 1 deletion csum-file.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extern struct sha1file *sha1fd(int fd, const char *name);
extern struct sha1file *sha1fd_check(const char *name);
extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp);
extern int sha1close(struct sha1file *, unsigned char *, unsigned int);
extern int sha1write(struct sha1file *, void *, unsigned int);
extern void sha1write(struct sha1file *, void *, unsigned int);
extern void sha1flush(struct sha1file *f);
extern void crc32_begin(struct sha1file *);
extern uint32_t crc32_end(struct sha1file *);
Expand Down
3 changes: 1 addition & 2 deletions pack-write.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 9af270e

Please sign in to comment.