progress: Create its own type

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

diff --git a/src/cli/lib/progressbar.c b/src/cli/lib/progressbar.c
index 3946fb4123104ea354dfd8924c8913a65bf7c0bb..0e3a2ae30f7d189c285e8fe7896c0060bb620890 100644 (file)
--- a/src/cli/lib/progressbar.c
+++ b/src/cli/lib/progressbar.c
@@ -62,7 +62,7 @@ struct cli_progressbar_widget {
 };
 
 struct cli_progressbar {
-       struct pakfire_progress* progress;
+       pakfire_progress* progress;
 
        // Output
        FILE* f;
@@ -77,7 +77,7 @@ struct cli_progressbar {
 };
 
 static int cli_progressbar_create(struct cli_progressbar** progressbar,
-               struct pakfire_progress* progress, FILE* f) {
+               pakfire_progress* progress, FILE* f) {
        struct cli_progressbar* p = NULL;
 
        // Allocate some memory
@@ -130,7 +130,7 @@ static void cli_progressbar_free(struct cli_progressbar* p) {
 }
 
 static void __cli_progressbar_free(pakfire_ctx* ctx,
-               struct pakfire_progress* progress, void* data) {
+               pakfire_progress* progress, void* data) {
        struct cli_progressbar* progressbar = data;
 
        cli_progressbar_free(progressbar);
@@ -238,7 +238,7 @@ ERROR:
        return (void *)(intptr_t)r;
 }
 
-static int cli_progressbar_start(pakfire_ctx* ctx, struct pakfire_progress* progress,
+static int cli_progressbar_start(pakfire_ctx* ctx, pakfire_progress* progress,
                void* data, unsigned long int max_value) {
        struct cli_progressbar* progressbar = data;
 
@@ -249,7 +249,7 @@ static int cli_progressbar_start(pakfire_ctx* ctx, struct pakfire_progress* prog
        return pthread_create(&progressbar->renderer, NULL, cli_progressbar_renderer, progressbar);
 }
 
-static int cli_progressbar_finish(pakfire_ctx* ctx, struct pakfire_progress* progress,
+static int cli_progressbar_finish(pakfire_ctx* ctx, pakfire_progress* progress,
                void* data) {
        struct cli_progressbar* progressbar = data;
        void* retval = NULL;
@@ -488,7 +488,7 @@ static int cli_progressbar_add_transfer_speed(struct cli_progressbar* p) {
        return cli_progressbar_add_widget(p, cli_progressbar_transfer_speed, NULL, 0, NULL);
 }
 
-int cli_setup_progressbar(pakfire_ctx* ctx, void* data, struct pakfire_progress* p) {
+int cli_setup_progressbar(pakfire_ctx* ctx, void* data, pakfire_progress* p) {
        struct cli_progressbar* progressbar = NULL;
        int r;
 

diff --git a/src/cli/lib/progressbar.h b/src/cli/lib/progressbar.h
index 74ee6559a4ec1cc67fa242c506bd05ccb92a0572..5a5eea1b4144599154860fc9c2f03ce7f9c3926c 100644 (file)
--- a/src/cli/lib/progressbar.h
+++ b/src/cli/lib/progressbar.h
@@ -24,6 +24,6 @@
 #include <pakfire/ctx.h>
 #include <pakfire/progress.h>
 
-int cli_setup_progressbar(pakfire_ctx* ctx, void* data, struct pakfire_progress* p);
+int cli_setup_progressbar(pakfire_ctx* ctx, void* data, pakfire_progress* p);
 
 #endif /* PAKFIRE_CLI_PROGRESSBAR_H */

diff --git a/src/pakfire/archive.c b/src/pakfire/archive.c
index 5e8203302c04cf4edb5f4255904c41d50266f71a..cf85455aca2d41dd8951e2021505062f3d9300a1 100644 (file)
--- a/src/pakfire/archive.c
+++ b/src/pakfire/archive.c
@@ -90,7 +90,7 @@ struct pakfire_archive {
        struct pakfire_hashes hashes;
 
        // Progress (when extracting)
-       struct pakfire_progress* progress;
+       pakfire_progress* progress;
 
        // Verify Status
        int verify;
@@ -1310,7 +1310,7 @@ ERROR:
 }
 
 static int __pakfire_archive_extract(pakfire_archive* archive,
-               const char* path, int flags, struct pakfire_progress* parent) {
+               const char* path, int flags, pakfire_progress* parent) {
        pakfire_package* pkg = NULL;
        char prefix[PATH_MAX] = "/";
        struct archive* writer = NULL;
@@ -1406,7 +1406,7 @@ ERROR:
 }
 
 int pakfire_archive_extract(pakfire_archive* archive,
-               const char* path, const int flags, struct pakfire_progress* parent) {
+               const char* path, const int flags, pakfire_progress* parent) {
        return __pakfire_archive_extract(archive, path, flags, parent);
 }
 

diff --git a/src/pakfire/archive.h b/src/pakfire/archive.h
index cad637f282ca81ada95198fc2a66f7d983442141..0778bf5537e26d0326a44b85810ab963e5433529 100644 (file)
--- a/src/pakfire/archive.h
+++ b/src/pakfire/archive.h
@@ -46,7 +46,7 @@ enum pakfire_archive_read_flags {
 
 FILE* pakfire_archive_read(pakfire_archive* archive, const char* filename, int flags);
 int pakfire_archive_extract(pakfire_archive* archive,
-       const char* path, const int flags, struct pakfire_progress* parent);
+       const char* path, const int flags, pakfire_progress* parent);
 
 const char* pakfire_archive_get_path(pakfire_archive* archive);
 const char* pakfire_archive_get_filename(pakfire_archive* self);

diff --git a/src/pakfire/archive_writer.c b/src/pakfire/archive_writer.c
index 39bace0ab2bad41187101bcd35c35787cfc08b2e..95e4a9a7f03111820d0d6680b9cec61205d17b80 100644 (file)
--- a/src/pakfire/archive_writer.c
+++ b/src/pakfire/archive_writer.c
@@ -77,7 +77,7 @@ struct pakfire_archive_writer {
        struct archive_entry_linkresolver* linkresolver;
 
        // Progress Status
-       struct pakfire_progress* progress;
+       pakfire_progress* progress;
 };
 
 /*

diff --git a/src/pakfire/ctx.c b/src/pakfire/ctx.c
index 5abf041b68764b25b0bd223a2ebe697e6bf61ead..2180b7befb5aa47ca742c73b5cac38d70f7081bc 100644 (file)
--- a/src/pakfire/ctx.c
+++ b/src/pakfire/ctx.c
@@ -362,7 +362,7 @@ void pakfire_ctx_set_progress_callback(pakfire_ctx* self,
        self->progress.data     = data;
 }
 
-int pakfire_ctx_setup_progress(pakfire_ctx* self, struct pakfire_progress* progress) {
+int pakfire_ctx_setup_progress(pakfire_ctx* self, pakfire_progress* progress) {
        if (!self->progress.callback)
                return 0;
 

diff --git a/src/pakfire/ctx.h b/src/pakfire/ctx.h
index 7934a4bd7be7271d3be03145e8f538307f81ed49..9a846af6c13ab9781df05a655482a337836f6ff7 100644 (file)
--- a/src/pakfire/ctx.h
+++ b/src/pakfire/ctx.h
@@ -73,7 +73,7 @@ void pakfire_ctx_set_confirm_callback(pakfire_ctx* self,
 // Progress
 
 typedef int (*pakfire_progress_callback)(pakfire_ctx* self,
-       void* data, struct pakfire_progress* progress);
+       void* data, pakfire_progress* progress);
 
 void pakfire_ctx_set_progress_callback(pakfire_ctx* self,
        pakfire_progress_callback callback, void* data);
@@ -101,7 +101,7 @@ int pakfire_ctx_confirm(pakfire_ctx* self, struct pakfire* pakfire,
 
 // Progress
 
-int pakfire_ctx_setup_progress(pakfire_ctx* self, struct pakfire_progress* progress);
+int pakfire_ctx_setup_progress(pakfire_ctx* self, pakfire_progress* progress);
 
 // Pick Solution
 

diff --git a/src/pakfire/filelist.c b/src/pakfire/filelist.c
index fb8953cfd2eb73d2a0953f4d511c916db29fd0f6..90cad5543b3cb6a764fdd6c19bdd0f4d2b458e99 100644 (file)
--- a/src/pakfire/filelist.c
+++ b/src/pakfire/filelist.c
@@ -498,7 +498,7 @@ int pakfire_filelist_contains(pakfire_filelist* list, const char* pattern) {
 
 int pakfire_filelist_walk(pakfire_filelist* list,
                pakfire_filelist_walk_callback callback, void* data, int flags, const char* title) {
-       struct pakfire_progress* progress = NULL;
+       pakfire_progress* progress = NULL;
        int r = 0;
 
        // Show progress when iterating over the filelist
@@ -573,7 +573,7 @@ int pakfire_filelist_dump(pakfire_filelist* list, int flags) {
        Verifies all files on the filelist
 */
 int pakfire_filelist_verify(pakfire_filelist* list, pakfire_filelist* errors) {
-       struct pakfire_progress* progress = NULL;
+       pakfire_progress* progress = NULL;
        int status;
        int r;
 

diff --git a/src/pakfire/httpclient.c b/src/pakfire/httpclient.c
index d3332bfc630101db532099ec5210ed6a3c065fdb..5617a6587efdeac8dea27ac78926573ffc3d744e 100644 (file)
--- a/src/pakfire/httpclient.c
+++ b/src/pakfire/httpclient.c
@@ -75,7 +75,7 @@ struct pakfire_httpclient {
        sd_event_source* timer;
 
        // Progress
-       struct pakfire_progress* progress;
+       pakfire_progress* progress;
 
        // How many transfers in parallel?
        long unsigned max_parallel;

diff --git a/src/pakfire/pakfire.h b/src/pakfire/pakfire.h
index 115af87928bba08314a60ad5f403f92018375cc1..c40d47659b3deb77c949e406cd6cb995f5cc01b7 100644 (file)
--- a/src/pakfire/pakfire.h
+++ b/src/pakfire/pakfire.h
@@ -113,7 +113,7 @@ pakfire_config* pakfire_get_config(struct pakfire* pakfire);
 
 int pakfire_confirm(struct pakfire* pakfire, const char* message, const char* question);
 int pakfire_pick_solution(struct pakfire* pakfire, struct pakfire_transaction* transaction);
-int pakfire_setup_progress(struct pakfire* pakfire, struct pakfire_progress* progress);
+int pakfire_setup_progress(struct pakfire* pakfire, pakfire_progress* progress);
 
 const char* pakfire_get_distro_name(struct pakfire* pakfire);
 const char* pakfire_get_distro_id(struct pakfire* pakfire);

diff --git a/src/pakfire/progress.c b/src/pakfire/progress.c
index c545136b4ed8c5c2fe0d378ca6529cdd89f9d511..8eed6831947d6cda76755fc81847653a876dc8f5 100644 (file)
--- a/src/pakfire/progress.c
+++ b/src/pakfire/progress.c
@@ -41,7 +41,7 @@ struct pakfire_progress {
        int flags;
 
        // Parent
-       struct pakfire_progress* parent;
+       pakfire_progress* parent;
 
        // Status
        enum pakfire_progress_state {
@@ -70,7 +70,7 @@ struct pakfire_progress {
        unsigned long int max_value;
 };
 
-static void pakfire_progress_free(struct pakfire_progress* p) {
+static void pakfire_progress_free(pakfire_progress* p) {
        // Ensure this is finished
        pakfire_progress_finish(p);
 
@@ -90,7 +90,7 @@ static void pakfire_progress_free(struct pakfire_progress* p) {
 }
 
 static int pakfire_progress_default_start_callback(pakfire_ctx* ctx,
-               struct pakfire_progress* p, void* data, unsigned long int value) {
+               pakfire_progress* p, void* data, unsigned long int value) {
        // Fetch the title
        const char* title = pakfire_progress_get_title(p);
 
@@ -101,9 +101,9 @@ static int pakfire_progress_default_start_callback(pakfire_ctx* ctx,
        return 0;
 }
 
-int pakfire_progress_create(struct pakfire_progress** progress,
-               pakfire_ctx* ctx, int flags, struct pakfire_progress* parent) {
-       struct pakfire_progress* p = NULL;
+int pakfire_progress_create(pakfire_progress** progress,
+               pakfire_ctx* ctx, int flags, pakfire_progress* parent) {
+       pakfire_progress* p = NULL;
        int r;
 
        // Allocate a new object
@@ -154,13 +154,13 @@ ERROR:
        return r;
 }
 
-struct pakfire_progress* pakfire_progress_ref(struct pakfire_progress* p) {
+pakfire_progress* pakfire_progress_ref(pakfire_progress* p) {
        ++p->nrefs;
 
        return p;
 }
 
-struct pakfire_progress* pakfire_progress_unref(struct pakfire_progress* p) {
+pakfire_progress* pakfire_progress_unref(pakfire_progress* p) {
        if (--p->nrefs > 0)
                return p;
 
@@ -168,7 +168,7 @@ struct pakfire_progress* pakfire_progress_unref(struct pakfire_progress* p) {
        return NULL;
 }
 
-int pakfire_progress_has_flag(struct pakfire_progress* p, int flag) {
+int pakfire_progress_has_flag(pakfire_progress* p, int flag) {
        return p->flags & flag;
 }
 
@@ -176,36 +176,36 @@ int pakfire_progress_has_flag(struct pakfire_progress* p, int flag) {
        Callback Configuration
 */
 
-void pakfire_progress_set_callback_data(struct pakfire_progress* p, void* data) {
+void pakfire_progress_set_callback_data(pakfire_progress* p, void* data) {
        p->callbacks.data = data;
 }
 
 void pakfire_progress_set_start_callback(
-               struct pakfire_progress* p, pakfire_progress_start_callback callback) {
+               pakfire_progress* p, pakfire_progress_start_callback callback) {
        p->callbacks.start = callback;
 }
 
 void pakfire_progress_set_finish_callback(
-               struct pakfire_progress* p, pakfire_progress_finish_callback callback) {
+               pakfire_progress* p, pakfire_progress_finish_callback callback) {
        p->callbacks.finish = callback;
 }
 
 void pakfire_progress_set_update_callback(
-               struct pakfire_progress* p, pakfire_progress_update_callback callback) {
+               pakfire_progress* p, pakfire_progress_update_callback callback) {
        p->callbacks.update = callback;
 }
 
 void pakfire_progress_set_status_callback(
-               struct pakfire_progress* p, pakfire_progress_status_callback callback) {
+               pakfire_progress* p, pakfire_progress_status_callback callback) {
        p->callbacks.status = callback;
 }
 
 void pakfire_progress_set_free_callback(
-               struct pakfire_progress* p, pakfire_progress_free_callback callback) {
+               pakfire_progress* p, pakfire_progress_free_callback callback) {
        p->callbacks.free = callback;
 }
 
-int pakfire_progress_start(struct pakfire_progress* p, unsigned long int value) {
+int pakfire_progress_start(pakfire_progress* p, unsigned long int value) {
        int r;
 
        // This can only be called once
@@ -244,7 +244,7 @@ int pakfire_progress_start(struct pakfire_progress* p, unsigned long int value)
        return pakfire_progress_update(p, 0);
 }
 
-int pakfire_progress_finish(struct pakfire_progress* p) {
+int pakfire_progress_finish(pakfire_progress* p) {
        int r;
 
        // Do nothing if already finished
@@ -273,7 +273,7 @@ int pakfire_progress_finish(struct pakfire_progress* p) {
        return 0;
 }
 
-int pakfire_progress_update(struct pakfire_progress* p, unsigned long int value) {
+int pakfire_progress_update(pakfire_progress* p, unsigned long int value) {
        int r = 0;
 
        // Report the change to the parent progress
@@ -300,11 +300,11 @@ int pakfire_progress_update(struct pakfire_progress* p, unsigned long int value)
        return r;
 }
 
-int pakfire_progress_increment(struct pakfire_progress* p, unsigned long int value) {
+int pakfire_progress_increment(pakfire_progress* p, unsigned long int value) {
        return pakfire_progress_update(p, p->value + value);
 }
 
-int pakfire_progress_reset(struct pakfire_progress* p) {
+int pakfire_progress_reset(pakfire_progress* p) {
        int r;
 
        switch (p->state) {
@@ -334,30 +334,30 @@ int pakfire_progress_reset(struct pakfire_progress* p) {
        return 0;
 }
 
-struct pakfire_progress* pakfire_progress_get_parent(struct pakfire_progress* p) {
+pakfire_progress* pakfire_progress_get_parent(pakfire_progress* p) {
        if (p->parent)
                return pakfire_progress_ref(p->parent);
 
        return NULL;
 }
 
-unsigned long int pakfire_progress_get_value(struct pakfire_progress* p) {
+unsigned long int pakfire_progress_get_value(pakfire_progress* p) {
        return p->value;
 }
 
-unsigned long int pakfire_progress_get_max_value(struct pakfire_progress* p) {
+unsigned long int pakfire_progress_get_max_value(pakfire_progress* p) {
        return p->max_value;
 }
 
-void pakfire_progress_set_max_value(struct pakfire_progress* p, unsigned long int value) {
+void pakfire_progress_set_max_value(pakfire_progress* p, unsigned long int value) {
        p->max_value = value;
 }
 
-const char* pakfire_progress_get_title(struct pakfire_progress* p) {
+const char* pakfire_progress_get_title(pakfire_progress* p) {
        return p->title;
 }
 
-int pakfire_progress_set_title(struct pakfire_progress* p, const char* format, ...) {
+int pakfire_progress_set_title(pakfire_progress* p, const char* format, ...) {
        va_list args;
        int r;
 
@@ -373,7 +373,7 @@ int pakfire_progress_set_title(struct pakfire_progress* p, const char* format, .
        return 0;
 }
 
-const char* pakfire_progress_get_status(struct pakfire_progress* p) {
+const char* pakfire_progress_get_status(pakfire_progress* p) {
        if (!p->status)
                return NULL;
 
@@ -384,7 +384,7 @@ const char* pakfire_progress_get_status(struct pakfire_progress* p) {
        return p->status[length - 1];
 }
 
-int pakfire_progress_push_status(struct pakfire_progress* p, const char* format, ...) {
+int pakfire_progress_push_status(pakfire_progress* p, const char* format, ...) {
        char status[256];
        va_list args;
        int r;
@@ -413,7 +413,7 @@ int pakfire_progress_push_status(struct pakfire_progress* p, const char* format,
        return 0;
 }
 
-void pakfire_progress_pop_status(struct pakfire_progress* p) {
+void pakfire_progress_pop_status(pakfire_progress* p) {
        const char* status = NULL;
 
        // Remove the latest status
@@ -429,14 +429,14 @@ void pakfire_progress_pop_status(struct pakfire_progress* p) {
        }
 }
 
-double pakfire_progress_get_percentage(struct pakfire_progress* p) {
+double pakfire_progress_get_percentage(pakfire_progress* p) {
        if (!p->max_value)
                return 0;
 
        return p->value * 100.0 / p->max_value;
 }
 
-time_t pakfire_progress_get_elapsed_time(struct pakfire_progress* p) {
+time_t pakfire_progress_get_elapsed_time(pakfire_progress* p) {
        struct timespec now;
        int r;
 
@@ -458,7 +458,7 @@ time_t pakfire_progress_get_elapsed_time(struct pakfire_progress* p) {
        return -1;
 }
 
-time_t pakfire_progress_get_eta(struct pakfire_progress* p) {
+time_t pakfire_progress_get_eta(pakfire_progress* p) {
        if (!p->value || !p->max_value)
                return 0;
 
@@ -469,7 +469,7 @@ time_t pakfire_progress_get_eta(struct pakfire_progress* p) {
        return t * p->max_value / p->value - t;
 }
 
-double pakfire_progress_get_transfer_speed(struct pakfire_progress* p) {
+double pakfire_progress_get_transfer_speed(pakfire_progress* p) {
        const time_t t = pakfire_progress_get_elapsed_time(p);
        if (t <= 0)
                return t;

diff --git a/src/pakfire/progress.h b/src/pakfire/progress.h
index edf3afa331c2921506376ea7ecb894622b3058ca..4cab3ee7e70a994b5cc48d0dca788cd38fc35418 100644 (file)
--- a/src/pakfire/progress.h
+++ b/src/pakfire/progress.h
@@ -23,7 +23,7 @@
 
 #include <time.h>
 
-struct pakfire_progress;
+typedef struct pakfire_progress pakfire_progress;
 
 #include <pakfire/ctx.h>
 
@@ -37,62 +37,62 @@ enum pakfire_progress_flags {
        PAKFIRE_PROGRESS_SHOW_TRANSFER_SPEED    = (1 << 6),
 };
 
-int pakfire_progress_has_flag(struct pakfire_progress* p, int flag);
+int pakfire_progress_has_flag(pakfire_progress* p, int flag);
 
 /*
        Callbacks
 */
 typedef int (*pakfire_progress_start_callback)
-       (pakfire_ctx* ctx, struct pakfire_progress* progress, void* data, unsigned long int value);
+       (pakfire_ctx* ctx, pakfire_progress* progress, void* data, unsigned long int value);
 typedef int (*pakfire_progress_finish_callback)
-       (pakfire_ctx* ctx, struct pakfire_progress* progress, void* data);
+       (pakfire_ctx* ctx, pakfire_progress* progress, void* data);
 typedef int (*pakfire_progress_update_callback)
-       (pakfire_ctx* ctx, struct pakfire_progress* progress, void* data, unsigned long int value);
+       (pakfire_ctx* ctx, pakfire_progress* progress, void* data, unsigned long int value);
 typedef int (*pakfire_progress_status_callback)
-       (pakfire_ctx* ctx, struct pakfire_progress* progress, void* data, const char* status);
+       (pakfire_ctx* ctx, pakfire_progress* progress, void* data, const char* status);
 typedef void (*pakfire_progress_free_callback)
-       (pakfire_ctx* ctx, struct pakfire_progress* progress, void* data);
+       (pakfire_ctx* ctx, pakfire_progress* progress, void* data);
 
-void pakfire_progress_set_callback_data(struct pakfire_progress* p, void* data);
+void pakfire_progress_set_callback_data(pakfire_progress* p, void* data);
 
 void pakfire_progress_set_start_callback(
-       struct pakfire_progress* p, pakfire_progress_start_callback callback);
+       pakfire_progress* p, pakfire_progress_start_callback callback);
 void pakfire_progress_set_finish_callback(
-       struct pakfire_progress* p, pakfire_progress_finish_callback callback);
+       pakfire_progress* p, pakfire_progress_finish_callback callback);
 void pakfire_progress_set_update_callback(
-       struct pakfire_progress* p, pakfire_progress_update_callback callback);
+       pakfire_progress* p, pakfire_progress_update_callback callback);
 void pakfire_progress_set_status_callback(
-       struct pakfire_progress* p, pakfire_progress_status_callback callback);
+       pakfire_progress* p, pakfire_progress_status_callback callback);
 void pakfire_progress_set_free_callback(
-       struct pakfire_progress* p, pakfire_progress_free_callback callback);
+       pakfire_progress* p, pakfire_progress_free_callback callback);
 
-struct pakfire_progress* pakfire_progress_get_parent(struct pakfire_progress* p);
-unsigned long int pakfire_progress_get_value(struct pakfire_progress* p);
-unsigned long int pakfire_progress_get_max_value(struct pakfire_progress* p);
-double pakfire_progress_get_percentage(struct pakfire_progress* p);
-time_t pakfire_progress_get_elapsed_time(struct pakfire_progress* p);
-time_t pakfire_progress_get_eta(struct pakfire_progress* p);
-double pakfire_progress_get_transfer_speed(struct pakfire_progress* p);
+pakfire_progress* pakfire_progress_get_parent(pakfire_progress* p);
+unsigned long int pakfire_progress_get_value(pakfire_progress* p);
+unsigned long int pakfire_progress_get_max_value(pakfire_progress* p);
+double pakfire_progress_get_percentage(pakfire_progress* p);
+time_t pakfire_progress_get_elapsed_time(pakfire_progress* p);
+time_t pakfire_progress_get_eta(pakfire_progress* p);
+double pakfire_progress_get_transfer_speed(pakfire_progress* p);
 
-int pakfire_progress_create(struct pakfire_progress** progress,
-       pakfire_ctx* ctx, int flags, struct pakfire_progress* parent);
+int pakfire_progress_create(pakfire_progress** progress,
+       pakfire_ctx* ctx, int flags, pakfire_progress* parent);
 
-struct pakfire_progress* pakfire_progress_ref(struct pakfire_progress* p);
-struct pakfire_progress* pakfire_progress_unref(struct pakfire_progress* p);
+pakfire_progress* pakfire_progress_ref(pakfire_progress* p);
+pakfire_progress* pakfire_progress_unref(pakfire_progress* p);
 
-int pakfire_progress_start(struct pakfire_progress* p, unsigned long int value);
-int pakfire_progress_finish(struct pakfire_progress* p);
-int pakfire_progress_update(struct pakfire_progress* p, unsigned long int value);
-int pakfire_progress_increment(struct pakfire_progress* p, unsigned long int value);
-int pakfire_progress_reset(struct pakfire_progress* p);
+int pakfire_progress_start(pakfire_progress* p, unsigned long int value);
+int pakfire_progress_finish(pakfire_progress* p);
+int pakfire_progress_update(pakfire_progress* p, unsigned long int value);
+int pakfire_progress_increment(pakfire_progress* p, unsigned long int value);
+int pakfire_progress_reset(pakfire_progress* p);
 
-const char* pakfire_progress_get_title(struct pakfire_progress* p);
-int pakfire_progress_set_title(struct pakfire_progress* p, const char* format, ...)
+const char* pakfire_progress_get_title(pakfire_progress* p);
+int pakfire_progress_set_title(pakfire_progress* p, const char* format, ...)
        __attribute__((format(printf, 2, 3)));
-const char* pakfire_progress_get_status(struct pakfire_progress* p);
-int pakfire_progress_push_status(struct pakfire_progress* p, const char* format, ...)
+const char* pakfire_progress_get_status(pakfire_progress* p);
+int pakfire_progress_push_status(pakfire_progress* p, const char* format, ...)
        __attribute__((format(printf, 2, 3)));
-void pakfire_progress_pop_status(struct pakfire_progress* p);
-void pakfire_progress_set_max_value(struct pakfire_progress* p, unsigned long int value);
+void pakfire_progress_pop_status(pakfire_progress* p);
+void pakfire_progress_set_max_value(pakfire_progress* p, unsigned long int value);
 
 #endif /* PAKFIRE_PROGRESS_H */

diff --git a/src/pakfire/repo.c b/src/pakfire/repo.c
index 3a784582d8cb09a930a1fa2b30748a5ef154c0ae..d710df22c5a9c2e42dade7b5c01f2dbfd40544a6 100644 (file)
--- a/src/pakfire/repo.c
+++ b/src/pakfire/repo.c
@@ -594,7 +594,7 @@ pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* self) {
 
 struct pakfire_repo_scan_ctx {
        // Progress
-       struct pakfire_progress* progress;
+       pakfire_progress* progress;
 
        // Flags
        enum pakfire_repo_scan_flags {

diff --git a/src/pakfire/transaction.c b/src/pakfire/transaction.c
index dfe32d5afda7484260d650ab7084ef48b168c0a5..f8dd4ecefa2cf73472722589f46088d32f9c003b 100644 (file)
--- a/src/pakfire/transaction.c
+++ b/src/pakfire/transaction.c
@@ -67,7 +67,7 @@ struct pakfire_transaction {
        size_t num;
 
        // Progress
-       struct pakfire_progress* progress;
+       pakfire_progress* progress;
 
        // Changes for file conflicts
        pakfire_packagelist* installed_packages;

diff --git a/src/pakfire/xfer.c b/src/pakfire/xfer.c
index e7dc9aeab6a1075ae29dca4949b1a463fa4994bf..e6eca9f6b50f8cca89d2f955fb9ed15f36ce7452 100644 (file)
--- a/src/pakfire/xfer.c
+++ b/src/pakfire/xfer.c
@@ -46,7 +46,7 @@ struct pakfire_xfer {
        int nrefs;
 
        // Reference to the progress indicator
-       struct pakfire_progress* progress;
+       pakfire_progress* progress;
 
        // cURL handle
        CURL* handle;
@@ -1561,7 +1561,7 @@ static int pakfire_xfer_update(void* data,
 }
 
 static int pakfire_xfer_prepare_progress(struct pakfire_xfer* xfer,
-               struct pakfire_progress* parent, int flags) {
+               pakfire_progress* parent, int flags) {
        const char* title = NULL;
        int progress_flags =
                PAKFIRE_PROGRESS_SHOW_PERCENTAGE |
@@ -1702,7 +1702,7 @@ ERROR:
        return r;
 }
 
-int pakfire_xfer_prepare(struct pakfire_xfer* xfer, struct pakfire_progress* progress, int flags) {
+int pakfire_xfer_prepare(struct pakfire_xfer* xfer, pakfire_progress* progress, int flags) {
        int r;
 
        // Increment tries

diff --git a/src/pakfire/xfer.h b/src/pakfire/xfer.h
index 20bec565c2566032af623a4cd9580b4b9a3aa481..f1ddc4f390ab51f8cecd998b78bc4e400704124a 100644 (file)
--- a/src/pakfire/xfer.h
+++ b/src/pakfire/xfer.h
@@ -151,7 +151,7 @@ int pakfire_xfer_response_get_error(const pakfire_xfer_response* response, char*
 // Input
 int pakfire_xfer_set_input(struct pakfire_xfer* xfer, FILE* f);
 
-int pakfire_xfer_prepare(struct pakfire_xfer* xfer, struct pakfire_progress* progress, int flags);
+int pakfire_xfer_prepare(struct pakfire_xfer* xfer, pakfire_progress* progress, int flags);
 pakfire_xfer_error_code_t pakfire_xfer_done(struct pakfire_xfer* xfer, sd_event* loop, int code);
 
 pakfire_xfer_error_code_t pakfire_xfer_run(struct pakfire_xfer* xfer, int flags);

diff --git a/src/python/ctx.c b/src/python/ctx.c
index e343850597ba35ba22710c59143c89e74395dea0..cc8f5aa92bbf322ed02da8f5b8feea92ee0c63ad 100644 (file)
--- a/src/python/ctx.c
+++ b/src/python/ctx.c
@@ -281,7 +281,7 @@ static PyObject* Ctx_set_confirm_callback(CtxObject* self, PyObject* args) {
 // Progress Callback
 
 static int Ctx_progress_start(pakfire_ctx* ctx,
-               struct pakfire_progress* progress, void* data, unsigned long int value) {
+               pakfire_progress* progress, void* data, unsigned long int value) {
        PyObject* ret = NULL;
        PyObject* p = data;
        int r = -1;
@@ -316,7 +316,7 @@ ERROR:
 }
 
 static int Ctx_progress_finish(pakfire_ctx* ctx,
-               struct pakfire_progress* progress, void* data) {
+               pakfire_progress* progress, void* data) {
        PyObject* ret = NULL;
        PyObject* p = data;
        int r = -1;
@@ -348,7 +348,7 @@ ERROR:
 }
 
 static int Ctx_progress_update(pakfire_ctx* ctx,
-               struct pakfire_progress* progress, void* data, unsigned long int value) {
+               pakfire_progress* progress, void* data, unsigned long int value) {
        PyObject* ret = NULL;
        PyObject* p = data;
        int r = -1;
@@ -380,7 +380,7 @@ ERROR:
 }
 
 static int Ctx_progress_status(pakfire_ctx* ctx,
-               struct pakfire_progress* progress, void* data, const char* text) {
+               pakfire_progress* progress, void* data, const char* text) {
        PyObject* ret = NULL;
        PyObject* p = data;
        int r = -1;
@@ -412,7 +412,7 @@ ERROR:
 }
 
 static void Ctx_progress_free(
-               pakfire_ctx* ctx, struct pakfire_progress* progress, void* data) {
+               pakfire_ctx* ctx, pakfire_progress* progress, void* data) {
        PyObject* p = data;
 
        // Acquire the GIL
@@ -426,7 +426,7 @@ static void Ctx_progress_free(
 }
 
 static int Ctx_progress_callback(
-               pakfire_ctx* ctx, void* data, struct pakfire_progress* progress) {
+               pakfire_ctx* ctx, void* data, pakfire_progress* progress) {
        PyObject* callback = data;
        PyObject* p = NULL;
        int r = -1;