progressbar: Export functions

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

diff --git a/src/libpakfire/include/pakfire/progressbar.h b/src/libpakfire/include/pakfire/progressbar.h
index 38e798a7ade71d7339376cc3d5e9d9c20d5b77d9..96c656b659fa50ac38ee0bbdfd63bf3cf0d11ac2 100644 (file)
--- a/src/libpakfire/include/pakfire/progressbar.h
+++ b/src/libpakfire/include/pakfire/progressbar.h
@@ -21,12 +21,8 @@
 #ifndef PAKFIRE_PROGRESSBAR_H
 #define PAKFIRE_PROGRESSBAR_H
 
-#ifdef PAKFIRE_PRIVATE
-
 #include <stdio.h>
 
-#include <pakfire/types.h>
-
 struct pakfire_progressbar;
 
 int pakfire_progressbar_create(struct pakfire_progressbar** progressbar, FILE* f);
@@ -51,6 +47,4 @@ int pakfire_progressbar_add_bytes_transferred(struct pakfire_progressbar* p);
 int pakfire_progressbar_add_eta(struct pakfire_progressbar* p);
 int pakfire_progressbar_add_transfer_speed(struct pakfire_progressbar* p);
 
-#endif
-
 #endif /* PAKFIRE_PROGRESSBAR_H */

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 6f555c0c0f0f44c179748ca23a2cf2ea9983602f..32aaba38a203ede2bc65255cb505fd6c2c382b33 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -287,6 +287,25 @@ global:
        pakfire_problem_to_string;
        pakfire_problem_unref;
 
+       # progressbar
+       pakfire_progressbar_add_bar;
+       pakfire_progressbar_add_bytes_transferred;
+       pakfire_progressbar_add_counter;
+       pakfire_progressbar_add_eta;
+       pakfire_progressbar_add_percentage;
+       pakfire_progressbar_add_string;
+       pakfire_progressbar_add_timer;
+       pakfire_progressbar_add_transfer_speed;
+       pakfire_progressbar_create;
+       pakfire_progressbar_finish;
+       pakfire_progressbar_increment;
+       pakfire_progressbar_ref;
+       pakfire_progressbar_reset;
+       pakfire_progressbar_set_max;
+       pakfire_progressbar_start;
+       pakfire_progressbar_unref;
+       pakfire_progressbar_update;
+
        # repo
        pakfire_repo_add_archive;
        pakfire_repo_cmp;

diff --git a/src/libpakfire/progressbar.c b/src/libpakfire/progressbar.c
index f7a95885e846e37936f3cd50e8fd5216eaf2bd90..f48b4bb45c16cb5962aaafb8d653eec528021077 100644 (file)
--- a/src/libpakfire/progressbar.c
+++ b/src/libpakfire/progressbar.c
@@ -27,6 +27,7 @@
 #include <time.h>
 
 #include <pakfire/i18n.h>
+#include <pakfire/private.h>
 #include <pakfire/progressbar.h>
 #include <pakfire/util.h>
 
@@ -124,7 +125,8 @@ static void pakfire_progressbar_free(struct pakfire_progressbar* p) {
        free(p);
 }
 
-int pakfire_progressbar_create(struct pakfire_progressbar** progressbar, FILE* f) {
+PAKFIRE_EXPORT int pakfire_progressbar_create(
+               struct pakfire_progressbar** progressbar, FILE* f) {
        struct pakfire_progressbar* p = calloc(1, sizeof(*p));
        if (!p)
                return ENOMEM;
@@ -157,13 +159,13 @@ ERROR:
        return r;
 }
 
-struct pakfire_progressbar* pakfire_progressbar_ref(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT struct pakfire_progressbar* pakfire_progressbar_ref(struct pakfire_progressbar* p) {
        ++p->nrefs;
 
        return p;
 }
 
-struct pakfire_progressbar* pakfire_progressbar_unref(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT struct pakfire_progressbar* pakfire_progressbar_unref(struct pakfire_progressbar* p) {
        if (--p->nrefs > 0)
                return p;
 
@@ -181,7 +183,7 @@ static time_t pakfire_progressbar_elapsed_time(struct pakfire_progressbar* p) {
        return now.tv_sec - p->time_start.tv_sec;
 }
 
-int pakfire_progressbar_start(struct pakfire_progressbar* p, unsigned long value) {
+PAKFIRE_EXPORT int pakfire_progressbar_start(struct pakfire_progressbar* p, unsigned long value) {
        if (p->status == PAKFIRE_PROGRESSBAR_RUNNING)
                return EINVAL;
 
@@ -201,7 +203,7 @@ int pakfire_progressbar_start(struct pakfire_progressbar* p, unsigned long value
 
 static int pakfire_progressbar_redraw(struct pakfire_progressbar* p);
 
-int pakfire_progressbar_update(struct pakfire_progressbar* p, unsigned long value) {
+PAKFIRE_EXPORT int pakfire_progressbar_update(struct pakfire_progressbar* p, unsigned long value) {
        if (p->status == PAKFIRE_PROGRESSBAR_INIT)
                return EINVAL;
 
@@ -210,11 +212,11 @@ int pakfire_progressbar_update(struct pakfire_progressbar* p, unsigned long valu
        return pakfire_progressbar_redraw(p);
 }
 
-int pakfire_progressbar_increment(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_increment(struct pakfire_progressbar* p) {
        return pakfire_progressbar_update(p, p->value + 1);
 }
 
-int pakfire_progressbar_finish(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_finish(struct pakfire_progressbar* p) {
        if (p->status != PAKFIRE_PROGRESSBAR_RUNNING)
                return EINVAL;
 
@@ -234,7 +236,7 @@ int pakfire_progressbar_finish(struct pakfire_progressbar* p) {
        return 0;
 }
 
-int pakfire_progressbar_reset(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_reset(struct pakfire_progressbar* p) {
        // Free all widgets
        pakfire_progressbar_free_widgets(p);
 
@@ -251,7 +253,8 @@ int pakfire_progressbar_reset(struct pakfire_progressbar* p) {
        return 0;
 }
 
-void pakfire_progressbar_set_max(struct pakfire_progressbar* p, unsigned long value) {
+PAKFIRE_EXPORT void pakfire_progressbar_set_max(
+               struct pakfire_progressbar* p, unsigned long value) {
        // Do nothing if nothing has changed
        if (p->value_max == value)
                return;
@@ -401,7 +404,8 @@ static const char* pakfire_progressbar_string(struct pakfire_progressbar* p,
        return (const char*)data;
 }
 
-int pakfire_progressbar_add_string(struct pakfire_progressbar* p, const char* format, ...) {
+PAKFIRE_EXPORT int pakfire_progressbar_add_string(struct pakfire_progressbar* p,
+               const char* format, ...) {
        char* s = NULL;
        va_list args;
 
@@ -426,7 +430,7 @@ static const char* pakfire_progressbar_counter(struct pakfire_progressbar* p,
        return widget->buffer;
 }
 
-int pakfire_progressbar_add_counter(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_add_counter(struct pakfire_progressbar* p) {
        return pakfire_progressbar_add_widget(p, pakfire_progressbar_counter, NULL, 0, NULL);
 }
 
@@ -443,7 +447,7 @@ static const char* pakfire_progressbar_percentage(struct pakfire_progressbar* p,
        return widget->buffer;
 }
 
-int pakfire_progressbar_add_percentage(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_add_percentage(struct pakfire_progressbar* p) {
        return pakfire_progressbar_add_widget(p, pakfire_progressbar_percentage, NULL, 0, NULL);
 }
 
@@ -474,7 +478,7 @@ static const char* pakfire_progressbar_bar(struct pakfire_progressbar* p,
        return widget->buffer;
 }
 
-int pakfire_progressbar_add_bar(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_add_bar(struct pakfire_progressbar* p) {
        return pakfire_progressbar_add_widget(p, pakfire_progressbar_bar, NULL, 1, NULL);
 }
 
@@ -493,7 +497,7 @@ static const char* pakfire_progressbar_timer(struct pakfire_progressbar* p,
        return widget->buffer;
 }
 
-int pakfire_progressbar_add_timer(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_add_timer(struct pakfire_progressbar* p) {
        return pakfire_progressbar_add_widget(p, pakfire_progressbar_timer, NULL, 0, NULL);
 }
 
@@ -537,7 +541,7 @@ static const char* pakfire_progressbar_eta(struct pakfire_progressbar* p,
        return widget->buffer;
 }
 
-int pakfire_progressbar_add_eta(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_add_eta(struct pakfire_progressbar* p) {
        return pakfire_progressbar_add_widget(p, pakfire_progressbar_eta, NULL, 0, NULL);
 }
 
@@ -552,7 +556,7 @@ static const char* pakfire_progressbar_bytes_transferred(struct pakfire_progress
        return widget->buffer;
 }
 
-int pakfire_progressbar_add_bytes_transferred(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_add_bytes_transferred(struct pakfire_progressbar* p) {
        return pakfire_progressbar_add_widget(p, pakfire_progressbar_bytes_transferred, NULL, 0, NULL);
 }
 
@@ -574,7 +578,7 @@ static const char* pakfire_progressbar_transfer_speed(struct pakfire_progressbar
        return widget->buffer;
 }
 
-int pakfire_progressbar_add_transfer_speed(struct pakfire_progressbar* p) {
+PAKFIRE_EXPORT int pakfire_progressbar_add_transfer_speed(struct pakfire_progressbar* p) {
        return pakfire_progressbar_add_widget(
                p, pakfire_progressbar_transfer_speed, NULL, 0, NULL);
 }