builder: Create its own type

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

diff --git a/src/pakfire/builder.c b/src/pakfire/builder.c
index 67ca28c1cd735b2430ac0f543243cc03c2e2e390..067b4617364e3d95540ed65250ff7c893290ae0d 100644 (file)
--- a/src/pakfire/builder.c
+++ b/src/pakfire/builder.c
@@ -65,7 +65,7 @@ struct pakfire_builder {
        unsigned int running_jobs;
 };
 
-static void pakfire_builder_free(struct pakfire_builder* self) {
+static void pakfire_builder_free(pakfire_builder* self) {
        if (self->reconnect_timer)
                sd_event_source_unref(self->reconnect_timer);
        if (self->stats_timer)
@@ -81,9 +81,9 @@ static void pakfire_builder_free(struct pakfire_builder* self) {
        free(self);
 }
 
-int pakfire_builder_create(struct pakfire_builder** builder,
+int pakfire_builder_create(pakfire_builder** builder,
                pakfire_ctx* ctx, pakfire_client* client) {
-       struct pakfire_builder* self = NULL;
+       pakfire_builder* self = NULL;
        int r;
 
        // Allocate some memory
@@ -114,13 +114,13 @@ ERROR:
        return r;
 }
 
-struct pakfire_builder* pakfire_builder_ref(struct pakfire_builder* self) {
+pakfire_builder* pakfire_builder_ref(pakfire_builder* self) {
        ++self->nrefs;
 
        return self;
 }
 
-struct pakfire_builder* pakfire_builder_unref(struct pakfire_builder* self) {
+pakfire_builder* pakfire_builder_unref(pakfire_builder* self) {
        if (--self->nrefs > 0)
                return self;
 
@@ -128,7 +128,7 @@ struct pakfire_builder* pakfire_builder_unref(struct pakfire_builder* self) {
        return NULL;
 }
 
-int pakfire_builder_connect(struct pakfire_builder* self) {
+int pakfire_builder_connect(pakfire_builder* self) {
        // Bail if we are already connected
        if (self->control)
                return -EBUSY;
@@ -145,7 +145,7 @@ static int pakfire_builder_submit_stats(sd_event_source* event, uint64_t usec, v
 /*
        Schedules submitting stats some time in the future...
 */
-static int pakfire_builder_schedule_stats(struct pakfire_builder* self, uint64_t usec) {
+static int pakfire_builder_schedule_stats(pakfire_builder* self, uint64_t usec) {
        int r;
 
        // Create the stats timer if it has not been created, yet
@@ -175,7 +175,7 @@ static int pakfire_builder_schedule_stats(struct pakfire_builder* self, uint64_t
 }
 
 static int pakfire_builder_submit_stats(sd_event_source* event, uint64_t usec, void* data) {
-       struct pakfire_builder* self = data;
+       pakfire_builder* self = data;
        struct pakfire_cpustat cpustat = {};
        struct pakfire_loadavg loadavg = {};
        struct pakfire_meminfo meminfo = {};
@@ -385,7 +385,7 @@ ERROR:
 }
 
 int pakfire_builder_connected(struct pakfire_xfer* xfer, void* data) {
-       struct pakfire_builder* self = data;
+       pakfire_builder* self = data;
        int r;
 
        DEBUG(self->ctx, "Builder connected\n");
@@ -406,7 +406,7 @@ int pakfire_builder_connected(struct pakfire_xfer* xfer, void* data) {
        be established or was interrupted. It will try to reconnect.
 */
 int pakfire_builder_close(struct pakfire_xfer* xfer, int code, void* data) {
-       struct pakfire_builder* self = data;
+       pakfire_builder* self = data;
        int r;
 
        // Log action
@@ -454,7 +454,7 @@ int pakfire_builder_close(struct pakfire_xfer* xfer, int code, void* data) {
 // Jobs
 
 static struct pakfire_job* pakfire_builder_find_job(
-               struct pakfire_builder* self, const char* job_id) {
+               pakfire_builder* self, const char* job_id) {
        // Walk through all jobs
        for (unsigned int i = 0; i < MAX_JOBS; i++) {
                if (!self->jobs[i])
@@ -471,7 +471,7 @@ static struct pakfire_job* pakfire_builder_find_job(
 /*
        Terminates all running jobs
 */
-int pakfire_builder_terminate_jobs(struct pakfire_builder* self) {
+int pakfire_builder_terminate_jobs(pakfire_builder* self) {
        int r;
 
        for (unsigned int i = 0; i < MAX_JOBS; i++) {
@@ -491,7 +491,7 @@ int pakfire_builder_terminate_jobs(struct pakfire_builder* self) {
 /*
        Called after a job has exited
 */
-int pakfire_builder_job_finished(struct pakfire_builder* self, struct pakfire_job* job) {
+int pakfire_builder_job_finished(pakfire_builder* self, struct pakfire_job* job) {
        int r;
 
        DEBUG(self->ctx, "Removing job %p\n", job);
@@ -526,7 +526,7 @@ int pakfire_builder_job_finished(struct pakfire_builder* self, struct pakfire_jo
        Called when we have received a message for a specific job
 */
 static int pakfire_builder_handle_job_message(
-               struct pakfire_builder* self, const char* job_id, struct json_object* message) {
+               pakfire_builder* self, const char* job_id, struct json_object* message) {
        struct pakfire_job* job = NULL;
        int r;
 
@@ -552,7 +552,7 @@ ERROR:
 /*
        Called when a new job has been received
 */
-static int pakfire_builder_job(struct pakfire_builder* self, json_object* m) {
+static int pakfire_builder_job(pakfire_builder* self, json_object* m) {
        struct json_object* data = NULL;
        struct pakfire_job* job = NULL;
        int r;
@@ -604,7 +604,7 @@ ERROR:
 }
 
 
-static int pakfire_builder_handle_message(struct pakfire_builder* self, struct json_object* message) {
+static int pakfire_builder_handle_message(pakfire_builder* self, struct json_object* message) {
        const char* job_id = NULL;
        const char* type = NULL;
        int r;
@@ -647,7 +647,7 @@ static int pakfire_builder_handle_message(struct pakfire_builder* self, struct j
 
 int pakfire_builder_recv(struct pakfire_xfer* xfer,
                const char* message, const size_t size, void* data) {
-       struct pakfire_builder* self = data;
+       pakfire_builder* self = data;
        struct json_object* m = NULL;
        char* error = NULL;
        int r;
@@ -672,13 +672,13 @@ ERROR:
 }
 
 int pakfire_builder_send(struct pakfire_xfer* xfer, void* data) {
-       struct pakfire_builder* self = data;
+       pakfire_builder* self = data;
 
        // Stream logs
        return pakfire_builder_stream_logs(self);
 }
 
-int pakfire_builder_send_message(struct pakfire_builder* self, struct json_object* message) {
+int pakfire_builder_send_message(pakfire_builder* self, struct json_object* message) {
        const char* m = NULL;
        size_t length = 0;
        int r;
@@ -716,7 +716,7 @@ int pakfire_builder_send_message(struct pakfire_builder* self, struct json_objec
        This function calls each running job which will only send one line
        at a time to ensure that one job will not take the entire bandwidth.
 */
-int pakfire_builder_stream_logs(struct pakfire_builder* self) {
+int pakfire_builder_stream_logs(pakfire_builder* self) {
        unsigned int lines;
        int r;
 

diff --git a/src/pakfire/builder.h b/src/pakfire/builder.h
index adfc6a0f9d485241c7785835f7356e5dbb06dbf2..4b0b38734b4f766c2095b27a6d55db79208764f4 100644 (file)
--- a/src/pakfire/builder.h
+++ b/src/pakfire/builder.h
@@ -21,7 +21,7 @@
 #ifndef PAKFIRE_BUILDER_H
 #define PAKFIRE_BUILDER_H
 
-struct pakfire_builder;
+typedef struct pakfire_builder pakfire_builder;
 
 // json-c
 #include <json.h>
@@ -31,14 +31,14 @@ struct pakfire_builder;
 #include <pakfire/job.h>
 #include <pakfire/xfer.h>
 
-int pakfire_builder_create(struct pakfire_builder** builder,
+int pakfire_builder_create(pakfire_builder** builder,
        pakfire_ctx* ctx, pakfire_client* client);
 
-struct pakfire_builder* pakfire_builder_ref(struct pakfire_builder* self);
-struct pakfire_builder* pakfire_builder_unref(struct pakfire_builder* self);
+pakfire_builder* pakfire_builder_ref(pakfire_builder* self);
+pakfire_builder* pakfire_builder_unref(pakfire_builder* self);
 
 // Connect
-int pakfire_builder_connect(struct pakfire_builder* self);
+int pakfire_builder_connect(pakfire_builder* self);
 
 // Socket Callbacks
 int pakfire_builder_connected(struct pakfire_xfer* xfer, void* data);
@@ -46,14 +46,14 @@ int pakfire_builder_close(struct pakfire_xfer* xfer, int code, void* data);
 int pakfire_builder_recv(struct pakfire_xfer* xfer, const char* message, const size_t size, void* data);
 int pakfire_builder_send(struct pakfire_xfer* xfer, void* data);
 
-int pakfire_builder_send_message(struct pakfire_builder* self, struct json_object* message);
+int pakfire_builder_send_message(pakfire_builder* self, struct json_object* message);
 
 // Jobs
 
-int pakfire_builder_terminate_jobs(struct pakfire_builder* self);
-int pakfire_builder_job_finished(struct pakfire_builder* self, struct pakfire_job* job);
+int pakfire_builder_terminate_jobs(pakfire_builder* self);
+int pakfire_builder_job_finished(pakfire_builder* self, struct pakfire_job* job);
 
 // Stream Logs
-int pakfire_builder_stream_logs(struct pakfire_builder* self);
+int pakfire_builder_stream_logs(pakfire_builder* self);
 
 #endif /* PAKFIRE_BUILDER_H */

diff --git a/src/pakfire/client.c b/src/pakfire/client.c
index 2c3caed293bce8cf017b034cd1fd0f938b3c0f64..64303dda978d88afd4a6960eac1544d66c50a620 100644 (file)
--- a/src/pakfire/client.c
+++ b/src/pakfire/client.c
@@ -782,8 +782,8 @@ ERROR:
 
 // Builder
 
-int pakfire_client_builder(struct pakfire_builder** builder, pakfire_client* self) {
-       struct pakfire_builder* b = NULL;
+int pakfire_client_builder(pakfire_builder** builder, pakfire_client* self) {
+       pakfire_builder* b = NULL;
        int r;
 
        // Create a new builder
@@ -802,7 +802,7 @@ ERROR:
        return r;
 }
 
-int pakfire_client_builder_connect(pakfire_client* self, struct pakfire_builder* builder) {
+int pakfire_client_builder_connect(pakfire_client* self, pakfire_builder* builder) {
        struct pakfire_xfer* xfer = NULL;
        int r;
 

diff --git a/src/pakfire/client.h b/src/pakfire/client.h
index aa8d03d7f6158076a64944cb706f857ea7f1c333..00cbea1fffcf2858a5cd87e3fd807a07c188e5e9 100644 (file)
--- a/src/pakfire/client.h
+++ b/src/pakfire/client.h
@@ -64,10 +64,10 @@ int pakfire_client_auth_user(pakfire_client* client, const char* password);
 
 // Builder
 
-int pakfire_client_builder(struct pakfire_builder** builder, pakfire_client* self);
+int pakfire_client_builder(pakfire_builder** builder, pakfire_client* self);
 
 // Low-level functions
-int pakfire_client_builder_connect(pakfire_client* self, struct pakfire_builder* builder);
+int pakfire_client_builder_connect(pakfire_client* self, pakfire_builder* builder);
 int pakfire_client_builder_disconnected(pakfire_client* self, struct pakfire_xfer* xfer);
 
 // Builds

diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c
index 1d8fc4af45f519ac52695a333ff97bac6f03900a..95090343b1c88df54227d8d1b27a6759ee147eb5 100644 (file)
--- a/src/pakfire/daemon.c
+++ b/src/pakfire/daemon.c
@@ -41,7 +41,7 @@ struct pakfire_daemon {
        pakfire_client* client;
 
        // Builder
-       struct pakfire_builder* builder;
+       pakfire_builder* builder;
 
        // Event Loop
        sd_event* loop;

diff --git a/src/pakfire/job.c b/src/pakfire/job.c
index 1ac16706727aeafa1d5d4622c33f5280aefb1421..6060c140d65642fe2d8d57a2c4143fe149bd56d4 100644 (file)
--- a/src/pakfire/job.c
+++ b/src/pakfire/job.c
@@ -55,7 +55,7 @@ struct pakfire_job {
        int nrefs;
 
        // Builder
-       struct pakfire_builder* builder;
+       pakfire_builder* builder;
 
        // Client
        pakfire_client* client;
@@ -857,7 +857,7 @@ int pakfire_job_stream_logs(struct pakfire_job* self) {
 }
 
 int pakfire_job_create(struct pakfire_job** job, pakfire_ctx* ctx,
-               pakfire_client* client, struct pakfire_builder* builder, json_object* data) {
+               pakfire_client* client, pakfire_builder* builder, json_object* data) {
        struct pakfire_job* j = NULL;
        char* p = NULL;
        int r;

diff --git a/src/pakfire/job.h b/src/pakfire/job.h
index 888e421f40d8eac00d6e4a60495a41ce4d895a7b..499790a891f53d50b3390a31de28407f38aca9a6 100644 (file)
--- a/src/pakfire/job.h
+++ b/src/pakfire/job.h
@@ -30,7 +30,7 @@
 struct pakfire_job;
 
 int pakfire_job_create(struct pakfire_job** worker, pakfire_ctx* ctx,
-       pakfire_client* client, struct pakfire_builder* builder, json_object* data);
+       pakfire_client* client, pakfire_builder* builder, json_object* data);
 
 struct pakfire_job* pakfire_job_ref(struct pakfire_job* worker);
 struct pakfire_job* pakfire_job_unref(struct pakfire_job* worker);