progressbar: Remove reference to Pakfire

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

diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c
index 29d7ea0df7c48cca24310fdbed695058f93a1c8e..37bd43dff27d3dca354836ded84f21ed4a645981 100644 (file)
--- a/src/libpakfire/downloader.c
+++ b/src/libpakfire/downloader.c
@@ -179,7 +179,7 @@ int pakfire_downloader_create(struct pakfire_downloader** downloader, Pakfire pa
                goto ERROR;
 
        // Create the progressbar
-       r = pakfire_progressbar_create(&d->progressbar, d->pakfire, NULL);
+       r = pakfire_progressbar_create(&d->progressbar, NULL);
        if (r)
                goto ERROR;
 

diff --git a/src/libpakfire/include/pakfire/progressbar.h b/src/libpakfire/include/pakfire/progressbar.h
index 248613727aedadbbcefad2435c4b65ab109eabd1..38e798a7ade71d7339376cc3d5e9d9c20d5b77d9 100644 (file)
--- a/src/libpakfire/include/pakfire/progressbar.h
+++ b/src/libpakfire/include/pakfire/progressbar.h
@@ -29,8 +29,7 @@
 
 struct pakfire_progressbar;
 
-int pakfire_progressbar_create(
-       struct pakfire_progressbar** progressbar, Pakfire pakfire, FILE* f);
+int pakfire_progressbar_create(struct pakfire_progressbar** progressbar, FILE* f);
 
 struct pakfire_progressbar* pakfire_progressbar_ref(struct pakfire_progressbar* p);
 struct pakfire_progressbar* pakfire_progressbar_unref(struct pakfire_progressbar* p);

diff --git a/src/libpakfire/progressbar.c b/src/libpakfire/progressbar.c
index c0e299c29f01fbebde88bba64afa12bb9a3ff356..f7a95885e846e37936f3cd50e8fd5216eaf2bd90 100644 (file)
--- a/src/libpakfire/progressbar.c
+++ b/src/libpakfire/progressbar.c
@@ -27,10 +27,7 @@
 #include <time.h>
 
 #include <pakfire/i18n.h>
-#include <pakfire/logging.h>
-#include <pakfire/pakfire.h>
 #include <pakfire/progressbar.h>
-#include <pakfire/types.h>
 #include <pakfire/util.h>
 
 #define REDRAW_TIMEOUT 100
@@ -49,7 +46,6 @@ struct pakfire_progressbar_widget {
 };
 
 struct pakfire_progressbar {
-       Pakfire pakfire;
        int nrefs;
 
        enum pakfire_progressbar_status {
@@ -82,25 +78,19 @@ struct pakfire_progressbar {
 static int pakfire_progressbar_update_terminal_size(struct pakfire_progressbar* p) {
        int fd = fileno(p->terminal.f);
 
+       // Set a default of 80x20
+       p->terminal.cols = 80;
+       p->terminal.rows = 20;
+
        // Check if output file is a TTY
        int r = isatty(fd);
-       if (r != 1) {
-               DEBUG(p->pakfire, "Output file descriptor %d is not a TTY: %s\n",
-                       fd, strerror(errno));
-
-               // Set a default of 80x20
-               p->terminal.cols = 80;
-               p->terminal.rows = 20;
-
+       if (r != 1)
                return 0;
-       }
 
        struct winsize w;
        r = ioctl(fd, TIOCGWINSZ, &w);
-       if (r) {
-               ERROR(p->pakfire, "Could not determine terminal size: %s\n", strerror(errno));
+       if (r)
                return r;
-       }
 
        // Save result
        p->terminal.rows = w.ws_row;
@@ -131,17 +121,15 @@ static void pakfire_progressbar_free_widgets(struct pakfire_progressbar* p) {
 
 static void pakfire_progressbar_free(struct pakfire_progressbar* p) {
        pakfire_progressbar_free_widgets(p);
-       pakfire_unref(p->pakfire);
        free(p);
 }
 
-int pakfire_progressbar_create(struct pakfire_progressbar** progressbar,
-               Pakfire pakfire, FILE* f) {
+int pakfire_progressbar_create(struct pakfire_progressbar** progressbar, FILE* f) {
        struct pakfire_progressbar* p = calloc(1, sizeof(*p));
        if (!p)
                return ENOMEM;
 
-       p->pakfire = pakfire_ref(pakfire);
+       // Initialise reference counting
        p->nrefs = 1;
 
        // Set output to stdout if nothing was set
@@ -205,10 +193,8 @@ int pakfire_progressbar_start(struct pakfire_progressbar* p, unsigned long value
 
        // Set start time
        int r = clock_gettime(CLOCK_MONOTONIC, &p->time_start);
-       if (r) {
-               ERROR(p->pakfire, "Could not set start time: %s\n", strerror(errno));
+       if (r)
                return r;
-       }
 
        return pakfire_progressbar_update(p, 0);
 }

diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index e078149fbec756bca834d8f24c0f38408741c8d7..fe8848397b3a77779ebeb167bde633174de48bb6 100644 (file)
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -855,7 +855,7 @@ PAKFIRE_EXPORT int pakfire_repo_scan(PakfireRepo repo, int flags) {
        const size_t num_files = pakfire_filelist_size(filelist);
 
        // Create progressbar
-       r = pakfire_progressbar_create(&progressbar, repo->pakfire, NULL);
+       r = pakfire_progressbar_create(&progressbar, NULL);
        if (r)
                goto ERROR;