]> git.ipfire.org Git - pakfire.git/commitdiff
jail: Drop extra function to check if buffer is full
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 19 Dec 2023 17:34:25 +0000 (17:34 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 19 Dec 2023 17:34:25 +0000 (17:34 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/jail.c

index b29ff13e759d120708835b08a50db9d8ccb5ce5a..53ac719fc3e3e8550a2e64af835678460745d8fb 100644 (file)
@@ -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;