From: Michael Tremer Date: Fri, 27 Jun 2025 14:22:18 +0000 (+0000) Subject: log stream: Create its own type X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d2c57adce9c78f7b1c1d3b8372a93f7d5688cd6;p=pakfire.git log stream: Create its own type Signed-off-by: Michael Tremer --- diff --git a/src/pakfire/jail.c b/src/pakfire/jail.c index 17df8717..5e75f583 100644 --- a/src/pakfire/jail.c +++ b/src/pakfire/jail.c @@ -145,11 +145,11 @@ typedef struct pakfire_jail_exec { FILE* stderr; // Logging - struct pakfire_log_stream* INFO; - struct pakfire_log_stream* WARN; - struct pakfire_log_stream* ERROR; + pakfire_log_stream* INFO; + pakfire_log_stream* WARN; + pakfire_log_stream* ERROR; #ifdef ENABLE_DEBUG - struct pakfire_log_stream* DEBUG; + pakfire_log_stream* DEBUG; #endif /* ENABLE_DEBUG */ } streams; @@ -1721,8 +1721,8 @@ static int __pakfire_jail_exec(pakfire_jail* jail, pakfire_jail_input_callback input_callback, void* input_data, pakfire_jail_output_callback output_callback, void* output_data, char** output, size_t* output_length) { - struct pakfire_log_stream* stdout = NULL; - struct pakfire_log_stream* stderr = NULL; + pakfire_log_stream* stdout = NULL; + pakfire_log_stream* stderr = NULL; int r; // We cannot have both, an output callback and buffer diff --git a/src/pakfire/job.c b/src/pakfire/job.c index b499a5bd..72cdef9d 100644 --- a/src/pakfire/job.c +++ b/src/pakfire/job.c @@ -99,8 +99,8 @@ struct pakfire_job { pakfire_log_buffer* buffer; // Streams - struct pakfire_log_stream* stdout; - struct pakfire_log_stream* stderr; + pakfire_log_stream* stdout; + pakfire_log_stream* stderr; // Stream Event sd_event_source* stream; diff --git a/src/pakfire/log_stream.c b/src/pakfire/log_stream.c index fcf0969a..64c4c3b9 100644 --- a/src/pakfire/log_stream.c +++ b/src/pakfire/log_stream.c @@ -52,7 +52,7 @@ struct pakfire_log_stream { void* data; }; -static void pakfire_log_stream_free(struct pakfire_log_stream* stream) { +static void pakfire_log_stream_free(pakfire_log_stream* stream) { if (stream->event) stream->event = sd_event_source_unref(stream->event); @@ -67,9 +67,9 @@ static void pakfire_log_stream_free(struct pakfire_log_stream* stream) { free(stream); } -int pakfire_log_stream_create(struct pakfire_log_stream** stream, pakfire_ctx* ctx, +int pakfire_log_stream_create(pakfire_log_stream** stream, pakfire_ctx* ctx, pakfire_log_stream_callback callback, void* data) { - struct pakfire_log_stream* s = NULL; + pakfire_log_stream* s = NULL; int r; // Allocate a new object @@ -108,13 +108,13 @@ ERROR: return r; } -struct pakfire_log_stream* pakfire_log_stream_ref(struct pakfire_log_stream* stream) { +pakfire_log_stream* pakfire_log_stream_ref(pakfire_log_stream* stream) { ++stream->nrefs; return stream; } -struct pakfire_log_stream* pakfire_log_stream_unref(struct pakfire_log_stream* stream) { +pakfire_log_stream* pakfire_log_stream_unref(pakfire_log_stream* stream) { if (--stream->nrefs > 0) return stream; @@ -125,7 +125,7 @@ struct pakfire_log_stream* pakfire_log_stream_unref(struct pakfire_log_stream* s #define pakfire_log_stream_sanitize_line(self, line, buffer, buffer_length) \ __pakfire_log_stream_sanitize_line(self, line, sizeof(line), buffer, buffer_length) -static int __pakfire_log_stream_sanitize_line(struct pakfire_log_stream* self, +static int __pakfire_log_stream_sanitize_line(pakfire_log_stream* self, char* line, ssize_t line_length, const char* buffer, ssize_t length) { ssize_t i = 0; int num; @@ -238,7 +238,7 @@ static int __pakfire_log_stream_sanitize_line(struct pakfire_log_stream* self, return cursor; } -static int pakfire_log_stream_drain_buffer(struct pakfire_log_stream* stream) { +static int pakfire_log_stream_drain_buffer(pakfire_log_stream* stream) { char line[MAX_LINE_LENGTH] = {}; size_t length = 0; int r; @@ -273,7 +273,7 @@ static int pakfire_log_stream_drain_buffer(struct pakfire_log_stream* stream) { } static int __pakfire_log_stream(sd_event_source* s, int fd, uint32_t events, void* data) { - struct pakfire_log_stream* stream = data; + pakfire_log_stream* stream = data; int r = -EINVAL; if (events & EPOLLIN) { @@ -305,7 +305,7 @@ static int __pakfire_log_stream(sd_event_source* s, int fd, uint32_t events, voi /* To be called from the parent process... */ -int pakfire_log_stream_in_parent(struct pakfire_log_stream* stream, sd_event* loop) { +int pakfire_log_stream_in_parent(pakfire_log_stream* stream, sd_event* loop) { int r; // Close the write end of the pipe @@ -328,7 +328,7 @@ int pakfire_log_stream_in_parent(struct pakfire_log_stream* stream, sd_event* lo /* To be called from the child process... */ -int pakfire_log_stream_in_child(struct pakfire_log_stream* stream) { +int pakfire_log_stream_in_child(pakfire_log_stream* stream) { // Close the read end of the pipe if (stream->pipe[0] >= 0) { close(stream->pipe[0]); @@ -338,7 +338,7 @@ int pakfire_log_stream_in_child(struct pakfire_log_stream* stream) { return 0; } -int pakfire_log_stream_printf(struct pakfire_log_stream* stream, const char* format, ...) { +int pakfire_log_stream_printf(pakfire_log_stream* stream, const char* format, ...) { va_list args; int r; @@ -349,7 +349,7 @@ int pakfire_log_stream_printf(struct pakfire_log_stream* stream, const char* for return r; } -int pakfire_log_stream_vprintf(struct pakfire_log_stream* stream, const char* format, va_list args) { +int pakfire_log_stream_vprintf(pakfire_log_stream* stream, const char* format, va_list args) { char* buffer = NULL; ssize_t length; int r; @@ -366,7 +366,7 @@ int pakfire_log_stream_vprintf(struct pakfire_log_stream* stream, const char* fo return r; } -int pakfire_log_stream_write(struct pakfire_log_stream* stream, const char* buffer, size_t length) { +int pakfire_log_stream_write(pakfire_log_stream* stream, const char* buffer, size_t length) { // Fail if the pipe isn't open if (stream->pipe[1] < 0) return -EPIPE; @@ -375,7 +375,7 @@ int pakfire_log_stream_write(struct pakfire_log_stream* stream, const char* buff return write(stream->pipe[1], buffer, length); } -int pakfire_log_stream_close(struct pakfire_log_stream* stream) { +int pakfire_log_stream_close(pakfire_log_stream* stream) { if (stream->pipe[0] >= 0) { close(stream->pipe[0]); stream->pipe[0] = -EBADF; @@ -390,7 +390,7 @@ 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; + pakfire_log_stream* self = cookie; ssize_t bytes_written; int r; @@ -409,7 +409,7 @@ static ssize_t __pakfire_log_stream_write(void* cookie, const char* buffer, size } static int __pakfire_log_stream_close(void* cookie) { - struct pakfire_log_stream* self = cookie; + pakfire_log_stream* self = cookie; // Release the reference to the stream if (self) @@ -418,8 +418,8 @@ static int __pakfire_log_stream_close(void* cookie) { return 0; } -FILE* pakfire_log_stream_as_file(struct pakfire_log_stream* self) { - struct pakfire_log_stream* stream = NULL; +FILE* pakfire_log_stream_as_file(pakfire_log_stream* self) { + pakfire_log_stream* stream = NULL; static cookie_io_functions_t functions = { .write = __pakfire_log_stream_write, .close = __pakfire_log_stream_close, diff --git a/src/pakfire/log_stream.h b/src/pakfire/log_stream.h index 083ec3e4..0806bc93 100644 --- a/src/pakfire/log_stream.h +++ b/src/pakfire/log_stream.h @@ -27,28 +27,28 @@ #include -struct pakfire_log_stream; +typedef struct pakfire_log_stream pakfire_log_stream; typedef int (*pakfire_log_stream_callback)(pakfire_ctx* ctx, void* data, const char* line, size_t length); -int pakfire_log_stream_create(struct pakfire_log_stream** stream, pakfire_ctx* ctx, +int pakfire_log_stream_create(pakfire_log_stream** stream, pakfire_ctx* ctx, pakfire_log_stream_callback callback, void* data); -struct pakfire_log_stream* pakfire_log_stream_ref(struct pakfire_log_stream* stream); -struct pakfire_log_stream* pakfire_log_stream_unref(struct pakfire_log_stream* stream); +pakfire_log_stream* pakfire_log_stream_ref(pakfire_log_stream* stream); +pakfire_log_stream* pakfire_log_stream_unref(pakfire_log_stream* stream); -int pakfire_log_stream_in_parent(struct pakfire_log_stream* stream, sd_event* loop); -int pakfire_log_stream_in_child(struct pakfire_log_stream* stream); +int pakfire_log_stream_in_parent(pakfire_log_stream* stream, sd_event* loop); +int pakfire_log_stream_in_child(pakfire_log_stream* stream); -int pakfire_log_stream_printf(struct pakfire_log_stream* stream, +int pakfire_log_stream_printf(pakfire_log_stream* stream, const char* format, ...) __attribute__((format(printf, 2, 3))); -int pakfire_log_stream_vprintf(struct pakfire_log_stream* stream, +int pakfire_log_stream_vprintf(pakfire_log_stream* stream, const char* format, va_list args) __attribute__((format(printf, 2, 0))); -int pakfire_log_stream_write(struct pakfire_log_stream* stream, +int pakfire_log_stream_write(pakfire_log_stream* stream, const char* buffer, size_t length); -int pakfire_log_stream_close(struct pakfire_log_stream* stream); +int pakfire_log_stream_close(pakfire_log_stream* stream); -FILE* pakfire_log_stream_as_file(struct pakfire_log_stream* self); +FILE* pakfire_log_stream_as_file(pakfire_log_stream* self); #endif /* PAKFIRE_LOG_STREAM_H */ diff --git a/tests/libpakfire/log_stream.c b/tests/libpakfire/log_stream.c index c12f7f3f..37b9eb1f 100644 --- a/tests/libpakfire/log_stream.c +++ b/tests/libpakfire/log_stream.c @@ -37,7 +37,7 @@ static int log_callback(pakfire_ctx* ctx, } static int test_simple(const struct test* t) { - struct pakfire_log_stream* stream = NULL; + pakfire_log_stream* stream = NULL; int r = EXIT_FAILURE; ASSERT_SUCCESS(pakfire_log_stream_create(&stream, t->ctx, NULL, NULL)); @@ -53,7 +53,7 @@ FAIL: } static int test_fork(const struct test* t) { - struct pakfire_log_stream* stream = NULL; + pakfire_log_stream* stream = NULL; sd_event* loop = NULL; int r = EXIT_FAILURE; @@ -110,7 +110,7 @@ FAIL: } static int test_file(const struct test* t) { - struct pakfire_log_stream* stream = NULL; + pakfire_log_stream* stream = NULL; int r = EXIT_FAILURE; int lines_read = 0; FILE* f = NULL;