object-file: inline write_buffer()

Commit Message

René Scharfe Dec. 13, 2022, 7:35 p.m. UTC

write_buffer() reports the OS error if it is unable to write.  Its only
caller dies in that case, giving some more context in its last message.

Inline this function and show only a single error message that includes
both the context (writing a loose object file) and the OS error.  This
shortens the code and simplifies the output.

Signed-off-by: René Scharfe <[e-mail]>
---
 object-file.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

--
2.39.0

Patch

diff --git a/object-file.c b/object-file.c
index 26290554bb..c1b71c2834 100644
--- a/object-file.c
+++ b/object-file.c
@@ -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;