From 8d8ca59fe21c797a3c17243d51d91c400bc98b85 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 24 Mar 2025 18:39:07 +0000 Subject: [PATCH] log stream: Return the number of bytes written Signed-off-by: Michael Tremer --- src/pakfire/buffer.c | 2 +- src/pakfire/log_stream.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pakfire/buffer.c b/src/pakfire/buffer.c index 3c11e8d9..caeb24cd 100644 --- a/src/pakfire/buffer.c +++ b/src/pakfire/buffer.c @@ -132,7 +132,7 @@ int pakfire_buffer_push(struct pakfire_buffer* self, const char* data, size_t le memcpy(self->data + self->used, data, length); self->used += length; - return 0; + return length; } int pakfire_buffer_pop(struct pakfire_buffer* self, size_t length) { diff --git a/src/pakfire/log_stream.c b/src/pakfire/log_stream.c index 01858bc2..d6abc24d 100644 --- a/src/pakfire/log_stream.c +++ b/src/pakfire/log_stream.c @@ -390,12 +390,13 @@ int pakfire_log_stream_close(struct pakfire_log_stream* stream) { static ssize_t __pakfire_log_stream_write(void* cookie, const char* buffer, size_t length) { struct pakfire_log_stream* self = cookie; + ssize_t bytes_written; int r; // Push the data into the buffer - r = pakfire_buffer_push(&self->buffer, buffer, length); - if (r < 0) - return r; + bytes_written = pakfire_buffer_push(&self->buffer, buffer, length); + if (bytes_written < 0) + return bytes_written; // Drain the buffer r = pakfire_log_stream_drain_buffer(self); @@ -403,7 +404,7 @@ static ssize_t __pakfire_log_stream_write(void* cookie, const char* buffer, size return r; // Return how many bytes we have consumed - return length; + return bytes_written; } static int __pakfire_log_stream_close(void* cookie) { -- 2.39.5