From: Michael Tremer Date: Tue, 19 Dec 2023 17:34:25 +0000 (+0000) Subject: jail: Drop extra function to check if buffer is full X-Git-Tag: 0.9.30~1262 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fef388792931e9cc3491fb57ff5c0997b54c214;p=pakfire.git jail: Drop extra function to check if buffer is full Signed-off-by: Michael Tremer --- diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c index b29ff13e7..53ac719fc 100644 --- a/src/libpakfire/jail.c +++ b/src/libpakfire/jail.c @@ -578,10 +578,6 @@ static void pakfire_jail_log_redirect(void* data, int priority, const char* file vdprintf(fd, format, args); } -static int pakfire_jail_log_buffer_is_full(const struct pakfire_log_buffer* buffer) { - return (sizeof(buffer->data) == buffer->used); -} - static int pakfire_jail_fill_buffer(struct pakfire_jail* jail, int fd, struct pakfire_log_buffer* buffer) { int r; @@ -627,7 +623,7 @@ static int pakfire_jail_drain_buffer_with_callback(struct pakfire_jail* jail, // No newline found if (!eol) { // If the buffer is full, we send the entire content to make space. - if (pakfire_jail_log_buffer_is_full(buffer)) { + if (buffer->used >= sizeof(buffer->data)) { CTX_DEBUG(jail->ctx, "Buffer is full. Sending all content\n"); eol = buffer->data + buffer->used - 1;