log buffer: Create its own type

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/job.c b/src/pakfire/job.c
index 6ec59acc76de2e975088a192e03470222edab99c..1c29287914c3c7ccadfb7de83ea98617e8c51235 100644 (file)
--- a/src/pakfire/job.c
+++ b/src/pakfire/job.c
@@ -96,7 +96,7 @@ struct pakfire_job {
                struct pakfire_log_file* file;
 
                // Buffer
-               struct pakfire_log_buffer* buffer;
+               pakfire_log_buffer* buffer;
 
                // Streams
                struct pakfire_log_stream* stdout;

diff --git a/src/pakfire/log_buffer.c b/src/pakfire/log_buffer.c
index 285ef38408a4ee1a1935dcd1d13be16a7463009d..12c5bf3f66068f0a5a48eaf3bf64597aebaa4ae8 100644 (file)
--- a/src/pakfire/log_buffer.c
+++ b/src/pakfire/log_buffer.c
@@ -51,7 +51,7 @@ static void pakfire_log_line_free(struct pakfire_log_line* line) {
        free(line);
 }
 
-static void pakfire_log_buffer_free(struct pakfire_log_buffer* buffer) {
+static void pakfire_log_buffer_free(pakfire_log_buffer* buffer) {
        struct pakfire_log_line* line = NULL;
 
        // Free all entries
@@ -68,8 +68,8 @@ static void pakfire_log_buffer_free(struct pakfire_log_buffer* buffer) {
        free(buffer);
 }
 
-int pakfire_log_buffer_create(struct pakfire_log_buffer** buffer, pakfire_ctx* ctx, size_t max_length) {
-       struct pakfire_log_buffer* b = NULL;
+int pakfire_log_buffer_create(pakfire_log_buffer** buffer, pakfire_ctx* ctx, size_t max_length) {
+       pakfire_log_buffer* b = NULL;
 
        // Allocate a new object
        b = calloc(1, sizeof(*b));
@@ -94,13 +94,13 @@ int pakfire_log_buffer_create(struct pakfire_log_buffer** buffer, pakfire_ctx* c
        return 0;
 }
 
-struct pakfire_log_buffer* pakfire_log_buffer_ref(struct pakfire_log_buffer* buffer) {
+pakfire_log_buffer* pakfire_log_buffer_ref(pakfire_log_buffer* buffer) {
        ++buffer->nrefs;
 
        return buffer;
 }
 
-struct pakfire_log_buffer* pakfire_log_buffer_unref(struct pakfire_log_buffer* buffer) {
+pakfire_log_buffer* pakfire_log_buffer_unref(pakfire_log_buffer* buffer) {
        if (--buffer->nrefs > 0)
                return buffer;
 
@@ -108,7 +108,7 @@ struct pakfire_log_buffer* pakfire_log_buffer_unref(struct pakfire_log_buffer* b
        return NULL;
 }
 
-static int pakfire_log_buffer_drop(struct pakfire_log_buffer* self) {
+static int pakfire_log_buffer_drop(pakfire_log_buffer* self) {
        struct timeval timestamp = {};
        int priority = 0;
        char* line = NULL;
@@ -125,7 +125,7 @@ static int pakfire_log_buffer_drop(struct pakfire_log_buffer* self) {
        return 0;
 }
 
-int pakfire_log_buffer_enqueue(struct pakfire_log_buffer* buffer, int priority, const char* line, ssize_t length) {
+int pakfire_log_buffer_enqueue(pakfire_log_buffer* buffer, int priority, const char* line, ssize_t length) {
        struct pakfire_log_line* l = NULL;
        int r;
 
@@ -186,7 +186,7 @@ ERROR:
        return r;
 }
 
-int pakfire_log_buffer_dequeue(struct pakfire_log_buffer* buffer,
+int pakfire_log_buffer_dequeue(pakfire_log_buffer* buffer,
                struct timeval* timestamp, int* priority, char** line, size_t* length) {
        struct pakfire_log_line* l = NULL;
 
@@ -236,7 +236,7 @@ int pakfire_log_buffer_dequeue(struct pakfire_log_buffer* buffer,
        return 0;
 }
 
-int pakfire_log_buffer_dump(struct pakfire_log_buffer* buffer, char** result, size_t* length) {
+int pakfire_log_buffer_dump(pakfire_log_buffer* buffer, char** result, size_t* length) {
        struct pakfire_log_line* line = NULL;
        char* s = NULL;
        size_t l = 0;

diff --git a/src/pakfire/log_buffer.h b/src/pakfire/log_buffer.h
index 9831384b1d3e1b107af4af1d7e5d6cdb04de6105..c5880c41488bdc29c25a271b67775001be72853f 100644 (file)
--- a/src/pakfire/log_buffer.h
+++ b/src/pakfire/log_buffer.h
@@ -29,16 +29,16 @@
        Ring buffer for log messages
 */
 
-struct pakfire_log_buffer;
+typedef struct pakfire_log_buffer pakfire_log_buffer;
 
-int pakfire_log_buffer_create(struct pakfire_log_buffer** buffer, pakfire_ctx* ctx, size_t size);
-struct pakfire_log_buffer* pakfire_log_buffer_ref(struct pakfire_log_buffer* buffer);
-struct pakfire_log_buffer* pakfire_log_buffer_unref(struct pakfire_log_buffer* buffer);
+int pakfire_log_buffer_create(pakfire_log_buffer** buffer, pakfire_ctx* ctx, size_t size);
+pakfire_log_buffer* pakfire_log_buffer_ref(pakfire_log_buffer* buffer);
+pakfire_log_buffer* pakfire_log_buffer_unref(pakfire_log_buffer* buffer);
 
-int pakfire_log_buffer_enqueue(struct pakfire_log_buffer* buffer, int priority, const char* line, ssize_t length);
-int pakfire_log_buffer_dequeue(struct pakfire_log_buffer* buffer,
+int pakfire_log_buffer_enqueue(pakfire_log_buffer* buffer, int priority, const char* line, ssize_t length);
+int pakfire_log_buffer_dequeue(pakfire_log_buffer* buffer,
        struct timeval* timestamp, int* priority, char** line, size_t* length);
 
-int pakfire_log_buffer_dump(struct pakfire_log_buffer* buffer, char** result, size_t* length);
+int pakfire_log_buffer_dump(pakfire_log_buffer* buffer, char** result, size_t* length);
 
 #endif /* PAKFIRE_LOG_BUFFER_H */

diff --git a/tests/libpakfire/log_buffer.c b/tests/libpakfire/log_buffer.c
index a16a0a900464afce1feffb673aceb29ab3b258e3..26af16be219e9195ec809cbbe290563df17c8a05 100644 (file)
--- a/tests/libpakfire/log_buffer.c
+++ b/tests/libpakfire/log_buffer.c
@@ -25,7 +25,7 @@
 #include "../testsuite.h"
 
 static int test_simple(const struct test* t) {
-       struct pakfire_log_buffer* buffer = NULL;
+       pakfire_log_buffer* buffer = NULL;
        struct timeval timestamp = {};
        char* line = NULL;
        size_t length = 0;
@@ -81,7 +81,7 @@ FAIL:
 }
 
 static int test_wrong_usage(const struct test* t) {
-       struct pakfire_log_buffer* buffer = NULL;
+       pakfire_log_buffer* buffer = NULL;
        struct timeval timestamp = {};
        int priority = -1;
        char* line = NULL;
@@ -110,7 +110,7 @@ FAIL:
 }
 
 static int test_full(const struct test* t) {
-       struct pakfire_log_buffer* buffer = NULL;
+       pakfire_log_buffer* buffer = NULL;
        struct timeval timestamp = {};
        char* line = NULL;
        size_t length = 0;