development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/clarify-error-in-write-loose-object' into maint-2.39

Browse source 
Code clean-up.

* rs/clarify-error-in-write-loose-object:
  object-file: inline write_buffer()
This commit is contained in:
Junio C Hamano 2023-02-14 14:15:57 -08:00
parent 651b4430d1 d422d06167
commit ff6c740339
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
object-file.c
View file

@ -1864,13 +1864,6 @@ int finalize_object_file(const char *tmpfile, const char *filename)
return 0;
}
static int write_buffer(int fd, const void *buf, size_t len)
{
if (write_in_full(fd, buf, len) < 0)
return error_errno(_("file write error"));
return 0;
}
static void hash_object_file_literally(const struct git_hash_algo *algo,
const void *buf, unsigned long len,
const char *type, struct object_id *oid)
@ -2015,8 +2008,8 @@ static int write_loose_object_common(git_hash_ctx *c,
ret = git_deflate(stream, flush ? Z_FINISH : 0);
the_hash_algo->update_fn(c, in0, stream->next_in - in0);
if (write_buffer(fd, compressed, stream->next_out - compressed) < 0)
die(_("unable to write loose object file"));
if (write_in_full(fd, compressed, stream->next_out - compressed) < 0)
die_errno(_("unable to write loose object file"));
stream->next_out = compressed;
stream->avail_out = compressed_len;