archive: Change type from PakfireArchive to struct pakfire_archive

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

diff --git a/src/_pakfire/archive.c b/src/_pakfire/archive.c
index 6675eaaf7c3375ede80e910b6d48c09b2de01f6e..a5ac8a9f757ba95d7ddb2f47bfec6fd924674a05 100644 (file)
--- a/src/_pakfire/archive.c
+++ b/src/_pakfire/archive.c
@@ -29,7 +29,7 @@
 #include "errors.h"
 #include "package.h"
 
-PyObject* new_archive(PyTypeObject* type, PakfireArchive archive) {
+PyObject* new_archive(PyTypeObject* type, struct pakfire_archive* archive) {
        ArchiveObject* self = (ArchiveObject *)type->tp_alloc(type, 0);
        if (self) {
                self->archive = pakfire_archive_ref(archive);

diff --git a/src/_pakfire/archive.h b/src/_pakfire/archive.h
index 25e72df0ffffc03ae1577406e5f77db14b17dd16..53e065eb17fe9a2a607b489a088de018ca03d026 100644 (file)
--- a/src/_pakfire/archive.h
+++ b/src/_pakfire/archive.h
@@ -27,11 +27,11 @@
 
 typedef struct {
        PyObject_HEAD
-       PakfireArchive archive;
+       struct pakfire_archive* archive;
 } ArchiveObject;
 
 extern PyTypeObject ArchiveType;
 
-PyObject* new_archive(PyTypeObject* type, PakfireArchive archive);
+PyObject* new_archive(PyTypeObject* type, struct pakfire_archive* archive);
 
 #endif /* PYTHON_PAKFIRE_ARCHIVE_H */

diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c
index a8b9f944d8af72c352597cba4d193b63a112ee9b..d91abc5f29f2ffabd41046cb4db6b29b30fd1a8a 100644 (file)
--- a/src/_pakfire/pakfire.c
+++ b/src/_pakfire/pakfire.c
@@ -1015,7 +1015,7 @@ static PyObject* Pakfire_sync(PakfireObject* self, PyObject* args, PyObject* kwa
 }
 
 static PyObject* Pakfire_open(PakfireObject* self, PyObject* args) {
-       PakfireArchive archive = NULL;
+       struct pakfire_archive* archive = NULL;
        const char* path = NULL;
 
        if (!PyArg_ParseTuple(args, "s", &path))

diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c
index 51f97fd753ff85651cb9f57958740e9658b510b8..864b166d66d48674eb3747d3d099d96ffc84aebf 100644 (file)
--- a/src/libpakfire/archive.c
+++ b/src/libpakfire/archive.c
@@ -60,7 +60,7 @@ struct pakfire_archive_chksum {
        unsigned char digest[EVP_MAX_MD_SIZE];
 };
 
-struct _PakfireArchive {
+struct pakfire_archive {
        Pakfire pakfire;
        int nrefs;
 
@@ -88,7 +88,7 @@ struct _PakfireArchive {
 /*
        A helper function to close the archive and reset our data structures
 */
-static void close_archive(PakfireArchive archive, struct archive* a) {
+static void close_archive(struct pakfire_archive* archive, struct archive* a) {
        archive_read_free(a);
 
        // Rewind the file descriptor
@@ -98,7 +98,7 @@ static void close_archive(PakfireArchive archive, struct archive* a) {
 /*
        A helper function that opens the archive for reading
 */
-static int open_archive(PakfireArchive archive, struct archive** a) {
+static int open_archive(struct pakfire_archive* archive, struct archive** a) {
        *a = archive_read_new();
        if (!*a)
                return ENOMEM;
@@ -142,7 +142,7 @@ static int find_archive_entry(struct archive_entry** entry, struct archive* a, c
 /*
        A helper function that opens the archive and finds a certain file in it
 */
-static int open_archive_and_find(PakfireArchive archive, struct archive** a,
+static int open_archive_and_find(struct pakfire_archive* archive, struct archive** a,
                struct archive_entry** entry, const char* filename) {
        int r = open_archive(archive, a);
        if (r)
@@ -157,7 +157,7 @@ static int open_archive_and_find(PakfireArchive archive, struct archive** a,
        return r;
 }
 
-static int open_archive_and_read(PakfireArchive archive, const char* filename,
+static int open_archive_and_read(struct pakfire_archive* archive, const char* filename,
                char** data, size_t* size) {
        struct archive* a = NULL;
        struct archive_entry* e = NULL;
@@ -200,7 +200,7 @@ static la_ssize_t pakfire_archive_read_callback(struct archive* a,
        }
 }
 
-static struct archive* pakfire_archive_open_payload(PakfireArchive archive,
+static struct archive* pakfire_archive_open_payload(struct pakfire_archive* archive,
                struct archive** a, size_t* size) {
        struct archive_entry* entry = NULL;
 
@@ -271,7 +271,7 @@ static int read_hexdigest(unsigned char* dst, size_t l, const char* src) {
        return 0;
 }
 
-static int pakfire_archive_add_chksum(PakfireArchive archive, const char* path,
+static int pakfire_archive_add_chksum(struct pakfire_archive* archive, const char* path,
                archive_checksum_algo_t algo, const char* hexdigest) {
        int r = 1;
 
@@ -308,7 +308,7 @@ ERROR:
 }
 
 static struct pakfire_archive_chksum* pakfire_archive_find_chksum(
-               PakfireArchive archive, const char* path) {
+               struct pakfire_archive* archive, const char* path) {
        struct pakfire_archive_chksum* chksum = NULL;
 
        STAILQ_FOREACH(chksum, &archive->chksums, nodes) {
@@ -320,7 +320,7 @@ static struct pakfire_archive_chksum* pakfire_archive_find_chksum(
        return NULL;
 }
 
-static void pakfire_archive_free_chksums(PakfireArchive archive) {
+static void pakfire_archive_free_chksums(struct pakfire_archive* archive) {
        struct pakfire_archive_chksum* chksum;
 
        while ((chksum = STAILQ_FIRST(&archive->chksums))) {
@@ -330,7 +330,7 @@ static void pakfire_archive_free_chksums(PakfireArchive archive) {
        }
 }
 
-static void pakfire_archive_free(PakfireArchive archive) {
+static void pakfire_archive_free(struct pakfire_archive* archive) {
        // Close the file
        if (archive->f)
                fclose(archive->f);
@@ -355,8 +355,8 @@ static void pakfire_archive_free(PakfireArchive archive) {
        free(archive);
 }
 
-static int pakfire_archive_create(PakfireArchive* archive, Pakfire pakfire) {
-       PakfireArchive a = calloc(1, sizeof(*a));
+static int pakfire_archive_create(struct pakfire_archive** archive, Pakfire pakfire) {
+       struct pakfire_archive* a = calloc(1, sizeof(*a));
        if (!a)
                return ENOMEM;
 
@@ -370,13 +370,13 @@ static int pakfire_archive_create(PakfireArchive* archive, Pakfire pakfire) {
        return 0;
 }
 
-PAKFIRE_EXPORT PakfireArchive pakfire_archive_ref(PakfireArchive archive) {
+PAKFIRE_EXPORT struct pakfire_archive* pakfire_archive_ref(struct pakfire_archive* archive) {
        ++archive->nrefs;
 
        return archive;
 }
 
-PAKFIRE_EXPORT PakfireArchive pakfire_archive_unref(PakfireArchive archive) {
+PAKFIRE_EXPORT struct pakfire_archive* pakfire_archive_unref(struct pakfire_archive* archive) {
        if (--archive->nrefs > 0)
                return archive;
 
@@ -385,11 +385,11 @@ PAKFIRE_EXPORT PakfireArchive pakfire_archive_unref(PakfireArchive archive) {
        return NULL;
 }
 
-PAKFIRE_EXPORT Pakfire pakfire_archive_get_pakfire(PakfireArchive archive) {
+PAKFIRE_EXPORT Pakfire pakfire_archive_get_pakfire(struct pakfire_archive* archive) {
        return pakfire_ref(archive->pakfire);
 }
 
-static struct pakfire_package* pakfire_archive_get_package(PakfireArchive archive) {
+static struct pakfire_package* pakfire_archive_get_package(struct pakfire_archive* archive) {
        if (!archive->package) {
                struct pakfire_repo* repo = pakfire_get_repo(archive->pakfire, "@dummy");
                if (!repo)
@@ -407,7 +407,7 @@ static struct pakfire_package* pakfire_archive_get_package(PakfireArchive archiv
 
 // Metadata
 
-static int pakfire_archive_parse_metadata(PakfireArchive archive) {
+static int pakfire_archive_parse_metadata(struct pakfire_archive* archive) {
        char* data = NULL;
        size_t size;
 
@@ -449,7 +449,7 @@ CLEANUP:
        return r;
 }
 
-static int pakfire_archive_parse_entry_checksums(PakfireArchive archive,
+static int pakfire_archive_parse_entry_checksums(struct pakfire_archive* archive,
                struct archive* a, struct archive_entry* e) {
        char* data;
        size_t data_size;
@@ -513,7 +513,7 @@ ERROR:
        return 0;
 }
 
-static int pakfire_archive_parse_entry_scriptlet(PakfireArchive archive,
+static int pakfire_archive_parse_entry_scriptlet(struct pakfire_archive* archive,
                struct archive* a, struct archive_entry* e, const char* filename) {
        struct pakfire_scriptlet* scriptlet;
        char* data = NULL;
@@ -557,8 +557,8 @@ ERROR:
        return r;
 }
 
-static int pakfire_archive_walk_entries(PakfireArchive archive, struct archive* a,
-               int (*callback)(PakfireArchive archive, struct archive* a, struct archive_entry* e, void* data),
+static int pakfire_archive_walk_entries(struct pakfire_archive* archive, struct archive* a,
+               int (*callback)(struct pakfire_archive* archive, struct archive* a, struct archive_entry* e, void* data),
                void* data) {
        struct archive_entry* e = NULL;
 
@@ -583,8 +583,8 @@ static int pakfire_archive_walk_entries(PakfireArchive archive, struct archive*
        return 0;
 }
 
-static int pakfire_archive_walk(PakfireArchive archive,
-               int (*callback)(PakfireArchive archive, struct archive* a, struct archive_entry* e, void* data),
+static int pakfire_archive_walk(struct pakfire_archive* archive,
+               int (*callback)(struct pakfire_archive* archive, struct archive* a, struct archive_entry* e, void* data),
                void* data) {
        struct archive* a;
 
@@ -602,7 +602,7 @@ static int pakfire_archive_walk(PakfireArchive archive,
        return r;
 }
 
-static int pakfire_archive_read_metadata_entry(PakfireArchive archive, struct archive* a,
+static int pakfire_archive_read_metadata_entry(struct pakfire_archive* archive, struct archive* a,
                struct archive_entry* e, void* data) {
        int ret;
 
@@ -624,7 +624,7 @@ static int pakfire_archive_read_metadata_entry(PakfireArchive archive, struct ar
        return 0;
 }
 
-static int pakfire_archive_read_metadata(PakfireArchive archive, struct archive* a) {
+static int pakfire_archive_read_metadata(struct pakfire_archive* archive, struct archive* a) {
        return pakfire_archive_walk(archive, pakfire_archive_read_metadata_entry, NULL);
 }
 
@@ -632,7 +632,7 @@ static int pakfire_archive_read_metadata(PakfireArchive archive, struct archive*
        This function tries (very easily) to find out whether something is a valid
        archive or not.
 */
-static int pakfire_archive_read_format(PakfireArchive archive, struct archive* a) {
+static int pakfire_archive_read_format(struct pakfire_archive* archive, struct archive* a) {
        struct archive_entry* entry = NULL;
        char* data = NULL;
        size_t size;
@@ -684,7 +684,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_archive_try_open(PakfireArchive archive, const char* path) {
+static int pakfire_archive_try_open(struct pakfire_archive* archive, const char* path) {
        struct archive* a = NULL;
 
        if (!path)
@@ -723,7 +723,7 @@ ERROR:
        return r;
 }
 
-PAKFIRE_EXPORT int pakfire_archive_open(PakfireArchive* archive, Pakfire pakfire, const char* path) {
+PAKFIRE_EXPORT int pakfire_archive_open(struct pakfire_archive** archive, Pakfire pakfire, const char* path) {
        int r = pakfire_archive_create(archive, pakfire);
        if (r)
                return r;
@@ -741,7 +741,7 @@ ERROR:
 }
 
 
-PAKFIRE_EXPORT char* pakfire_archive_get(PakfireArchive archive, const char* namespace, const char* key) {
+PAKFIRE_EXPORT char* pakfire_archive_get(struct pakfire_archive* archive, const char* namespace, const char* key) {
        int r = pakfire_archive_parse_metadata(archive);
        if (r)
                return NULL;
@@ -749,7 +749,7 @@ PAKFIRE_EXPORT char* pakfire_archive_get(PakfireArchive archive, const char* nam
        return pakfire_parser_get(archive->parser, namespace, key);
 }
 
-PAKFIRE_EXPORT int pakfire_archive_read(PakfireArchive archive, const char* filename,
+PAKFIRE_EXPORT int pakfire_archive_read(struct pakfire_archive* archive, const char* filename,
                char** data, size_t* data_size) {
        struct archive* a = NULL;
        struct archive_entry* entry = NULL;
@@ -778,7 +778,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_archive_extraction_path(PakfireArchive archive,
+static int pakfire_archive_extraction_path(struct pakfire_archive* archive,
                char* path, size_t length, const char* prefix) {
        char buffer[PATH_MAX];
 
@@ -815,7 +815,7 @@ struct pakfire_archive_extractor {
 };
 
 static int pakfire_archive_extract_progressbar(
-               PakfireArchive archive, struct pakfire_progressbar** progressbar) {
+               struct pakfire_archive* archive, struct pakfire_progressbar** progressbar) {
        int r = 1;
 
        struct pakfire_package* pkg = pakfire_archive_get_package(archive);
@@ -848,7 +848,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_archive_extract_entry(PakfireArchive archive,
+static int pakfire_archive_extract_entry(struct pakfire_archive* archive,
                struct archive* a, struct archive_entry* entry, void* data) {
        struct pakfire_archive_extractor* extractor = (struct pakfire_archive_extractor*)data;
 
@@ -907,7 +907,7 @@ static int pakfire_archive_extract_entry(PakfireArchive archive,
        return 0;
 }
 
-PAKFIRE_EXPORT int pakfire_archive_extract(PakfireArchive archive, const char* prefix) {
+PAKFIRE_EXPORT int pakfire_archive_extract(struct pakfire_archive* archive, const char* prefix) {
        struct pakfire_progressbar* progressbar = NULL;
        char path[PATH_MAX];
        struct archive* a = NULL;
@@ -967,15 +967,15 @@ ERROR:
        return r;
 }
 
-PAKFIRE_EXPORT const char* pakfire_archive_get_path(PakfireArchive archive) {
+PAKFIRE_EXPORT const char* pakfire_archive_get_path(struct pakfire_archive* archive) {
        return archive->path;
 }
 
-PAKFIRE_EXPORT unsigned int pakfire_archive_get_format(PakfireArchive archive) {
+PAKFIRE_EXPORT unsigned int pakfire_archive_get_format(struct pakfire_archive* archive) {
        return archive->format;
 }
 
-static int pakfire_archive_load_filelist_mtree(PakfireArchive archive) {
+static int pakfire_archive_load_filelist_mtree(struct pakfire_archive* archive) {
        struct archive* a;
        struct archive_entry* entry;
        int r;
@@ -1054,7 +1054,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_archive_load_filelist_legacy(PakfireArchive archive) {
+static int pakfire_archive_load_filelist_legacy(struct pakfire_archive* archive) {
        char* data = NULL;
        size_t size;
 
@@ -1082,14 +1082,14 @@ static int pakfire_archive_load_filelist_legacy(PakfireArchive archive) {
        return r;
 }
 
-static int pakfire_archive_load_filelist(PakfireArchive archive) {
+static int pakfire_archive_load_filelist(struct pakfire_archive* archive) {
        if (archive->format >= 6)
                return pakfire_archive_load_filelist_mtree(archive);
        else
                return pakfire_archive_load_filelist_legacy(archive);
 }
 
-PAKFIRE_EXPORT PakfireFilelist pakfire_archive_get_filelist(PakfireArchive archive) {
+PAKFIRE_EXPORT PakfireFilelist pakfire_archive_get_filelist(struct pakfire_archive* archive) {
        if (!archive->filelist) {
                int r = pakfire_archive_load_filelist(archive);
                if (r)
@@ -1178,7 +1178,7 @@ ERROR:
 /*
        This function is called to examine whether we have a signature and if so verify it
 */
-static int pakfire_archive_verify_signature(PakfireArchive archive, struct archive* a,
+static int pakfire_archive_verify_signature(struct pakfire_archive* archive, struct archive* a,
                struct archive_entry* e, void* data) {
        const char* entry_name = archive_entry_pathname(e);
 
@@ -1277,7 +1277,7 @@ ERROR:
 /*
        This function walks through the archive looking for signatures and verifies them
 */
-static int pakfire_archive_verify_signatures(PakfireArchive archive) {
+static int pakfire_archive_verify_signatures(struct pakfire_archive* archive) {
        char* buffer = NULL;
        size_t size = 0;
 
@@ -1314,7 +1314,7 @@ ERROR:
        return r;
 }
 
-PAKFIRE_EXPORT pakfire_archive_verify_status_t pakfire_archive_verify(PakfireArchive archive) {
+PAKFIRE_EXPORT pakfire_archive_verify_status_t pakfire_archive_verify(struct pakfire_archive* archive) {
        DEBUG(archive->pakfire, "Verifying archive %p\n", archive);
 
        // Return previous result if this has already been called
@@ -1385,7 +1385,7 @@ PAKFIRE_EXPORT const char* pakfire_archive_verify_strerror(pakfire_archive_verif
        return NULL;
 }
 
-PAKFIRE_EXPORT size_t pakfire_archive_get_size(PakfireArchive archive) {
+PAKFIRE_EXPORT size_t pakfire_archive_get_size(struct pakfire_archive* archive) {
        struct stat buf;
 
        int r = stat(archive->path, &buf);
@@ -1401,7 +1401,7 @@ PAKFIRE_EXPORT size_t pakfire_archive_get_size(PakfireArchive archive) {
 /*
        Copy all metadata from this archive to the package object
 */
-PAKFIRE_EXPORT struct pakfire_package* pakfire_archive_make_package(PakfireArchive archive, struct pakfire_repo* repo) {
+PAKFIRE_EXPORT struct pakfire_package* pakfire_archive_make_package(struct pakfire_archive* archive, struct pakfire_repo* repo) {
        char* name = pakfire_archive_get(archive, "package", "name");
        char* arch = pakfire_archive_get(archive, "package", "arch");
 
@@ -1583,7 +1583,7 @@ PAKFIRE_EXPORT struct pakfire_package* pakfire_archive_make_package(PakfireArchi
 }
 
 struct pakfire_scriptlet* pakfire_archive_get_scriptlet(
-               PakfireArchive archive, const char* type) {
+               struct pakfire_archive* archive, const char* type) {
        struct pakfire_scriptlet* scriptlet;
 
        for (unsigned int i = 0; i < archive->nscriptlets; i++) {

diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index 2d5bb1a0788f4393d518e46e382c6d39b5a02317..d6a267d1b4e1d62f2af76e7311305f5acaba97f9 100644 (file)
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -750,7 +750,7 @@ END:
        return r;
 }
 
-static int pakfire_db_add_files(struct pakfire_db* db, unsigned long id, PakfireArchive archive) {
+static int pakfire_db_add_files(struct pakfire_db* db, unsigned long id, struct pakfire_archive* archive) {
        sqlite3_stmt* stmt = NULL;
        int r = 1;
 
@@ -924,7 +924,7 @@ END:
        return r;
 }
 
-static int pakfire_db_add_scriptlets(struct pakfire_db* db, unsigned long id, PakfireArchive archive) {
+static int pakfire_db_add_scriptlets(struct pakfire_db* db, unsigned long id, struct pakfire_archive* archive) {
        sqlite3_stmt* stmt = NULL;
        size_t size;
        int r = 1;
@@ -1001,7 +1001,7 @@ END:
 }
 
 int pakfire_db_add_package(struct pakfire_db* db,
-               struct pakfire_package* pkg, PakfireArchive archive, int userinstalled) {
+               struct pakfire_package* pkg, struct pakfire_archive* archive, int userinstalled) {
        sqlite3_stmt* stmt = NULL;
        int r;
 

diff --git a/src/libpakfire/include/pakfire/archive.h b/src/libpakfire/include/pakfire/archive.h
index 640a89ba5e306c7ff9417cf13d9b080c49227cac..448fd2611c13081e4ab5c7515528b8d63bde3d80 100644 (file)
--- a/src/libpakfire/include/pakfire/archive.h
+++ b/src/libpakfire/include/pakfire/archive.h
@@ -23,6 +23,8 @@
 
 #include <stddef.h>
 
+struct pakfire_archive;
+
 #include <pakfire/package.h>
 #include <pakfire/repo.h>
 #include <pakfire/scriptlet.h>
@@ -39,29 +41,29 @@ typedef enum pakfire_archive_verify_status {
        PAKFIRE_ARCHIVE_VERIFY_ERROR,
 } pakfire_archive_verify_status_t;
 
-int pakfire_archive_open(PakfireArchive* archive, Pakfire pakfire, const char* path);
-PakfireArchive pakfire_archive_ref(PakfireArchive archive);
-PakfireArchive pakfire_archive_unref(PakfireArchive archive);
-Pakfire pakfire_archive_get_pakfire(PakfireArchive archive);
+int pakfire_archive_open(struct pakfire_archive** archive, Pakfire pakfire, const char* path);
+struct pakfire_archive* pakfire_archive_ref(struct pakfire_archive* archive);
+struct pakfire_archive* pakfire_archive_unref(struct pakfire_archive* archive);
+Pakfire pakfire_archive_get_pakfire(struct pakfire_archive* archive);
 
-char* pakfire_archive_get(PakfireArchive archive, const char* namespace, const char* key);
+char* pakfire_archive_get(struct pakfire_archive* archive, const char* namespace, const char* key);
 
-int pakfire_archive_read(PakfireArchive archive, const char* filename,
+int pakfire_archive_read(struct pakfire_archive* archive, const char* filename,
        char** data, size_t* data_size);
-int pakfire_archive_extract(PakfireArchive archive, const char* prefix);
+int pakfire_archive_extract(struct pakfire_archive* archive, const char* prefix);
 
-const char* pakfire_archive_get_path(PakfireArchive archive);
+const char* pakfire_archive_get_path(struct pakfire_archive* archive);
 
-unsigned int pakfire_archive_get_format(PakfireArchive archive);
+unsigned int pakfire_archive_get_format(struct pakfire_archive* archive);
 
-PakfireFilelist pakfire_archive_get_filelist(PakfireArchive archive);
+PakfireFilelist pakfire_archive_get_filelist(struct pakfire_archive* archive);
 
-pakfire_archive_verify_status_t pakfire_archive_verify(PakfireArchive archive);
+pakfire_archive_verify_status_t pakfire_archive_verify(struct pakfire_archive* archive);
 const char* pakfire_archive_verify_strerror(pakfire_archive_verify_status_t status);
 
-size_t pakfire_archive_get_size(PakfireArchive archive);
+size_t pakfire_archive_get_size(struct pakfire_archive* archive);
 struct pakfire_package* pakfire_archive_make_package(
-       PakfireArchive archive, struct pakfire_repo* repo);
+       struct pakfire_archive* archive, struct pakfire_repo* repo);
 
 #define PAKFIRE_ARCHIVE_FN_CHECKSUMS           "chksums"
 #define PAKFIRE_ARCHIVE_FN_FILELIST                    "filelist"
@@ -73,7 +75,7 @@ struct pakfire_package* pakfire_archive_make_package(
 #ifdef PAKFIRE_PRIVATE
 
 struct pakfire_scriptlet* pakfire_archive_get_scriptlet(
-       PakfireArchive archive, const char* type);
+       struct pakfire_archive* archive, const char* type);
 
 typedef enum archive_checksum_algo {
        PAKFIRE_CHECKSUM_UNKNOWN = 0,

diff --git a/src/libpakfire/include/pakfire/db.h b/src/libpakfire/include/pakfire/db.h
index b978e8721acfc921543c648bc56b0a97ce9440af..3e2376ce5a7a7c768ab601dd13463bfad1297ac4 100644 (file)
--- a/src/libpakfire/include/pakfire/db.h
+++ b/src/libpakfire/include/pakfire/db.h
@@ -25,6 +25,7 @@
 
 #include <sys/types.h>
 
+#include <pakfire/archive.h>
 #include <pakfire/package.h>
 #include <pakfire/repo.h>
 #include <pakfire/scriptlet.h>
@@ -47,7 +48,7 @@ int pakfire_db_check(struct pakfire_db* db);
 ssize_t pakfire_db_packages(struct pakfire_db* db);
 
 int pakfire_db_add_package(struct pakfire_db* db, struct pakfire_package* pkg,
-       PakfireArchive archive, int userinstalled);
+       struct pakfire_archive* archive, int userinstalled);
 int pakfire_db_remove_package(struct pakfire_db* db, struct pakfire_package* pkg);
 
 int pakfire_db_load(struct pakfire_db* db, struct pakfire_repo* repo);

diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h
index 397875f1a98fe34ff2827a336300494ff5645e39..b6ef1ef6569382640d8574a5f653baadc9d5158e 100644 (file)
--- a/src/libpakfire/include/pakfire/package.h
+++ b/src/libpakfire/include/pakfire/package.h
@@ -103,7 +103,7 @@ struct pakfire_repo* pakfire_package_get_repo(struct pakfire_package* pkg);
 
 char* pakfire_package_dump(struct pakfire_package* pkg, int flags);
 
-PakfireArchive pakfire_package_get_archive(struct pakfire_package* pkg);
+struct pakfire_archive* pakfire_package_get_archive(struct pakfire_package* pkg);
 
 PakfireFilelist pakfire_package_get_filelist(struct pakfire_package* pkg);
 int pakfire_package_set_filelist(struct pakfire_package* pkg, PakfireFilelist filelist);

diff --git a/src/libpakfire/include/pakfire/repo.h b/src/libpakfire/include/pakfire/repo.h
index 67ec53cb4483c921af98bcd7f1c479ab076e451a..764f49336b8d26d1b3d32b312570a357e426e393 100644 (file)
--- a/src/libpakfire/include/pakfire/repo.h
+++ b/src/libpakfire/include/pakfire/repo.h
@@ -27,6 +27,7 @@
 
 struct pakfire_repo;
 
+#include <pakfire/archive.h>
 #include <pakfire/package.h>
 #include <pakfire/types.h>
 
@@ -74,7 +75,7 @@ int pakfire_repo_read_solv_fp(struct pakfire_repo* repo, FILE *f, int flags);
 int pakfire_repo_write_solv(struct pakfire_repo* repo, const char* filename, int flags);
 int pakfire_repo_write_solv_fp(struct pakfire_repo* repo, FILE *f, int flags);
 
-struct pakfire_package* pakfire_repo_add_archive(struct pakfire_repo* repo, PakfireArchive archive);
+struct pakfire_package* pakfire_repo_add_archive(struct pakfire_repo* repo, struct pakfire_archive* archive);
 
 // Cache
 

diff --git a/src/libpakfire/include/pakfire/types.h b/src/libpakfire/include/pakfire/types.h
index 36b8a107abc0dcf47c6eb4a7bdf6c3bda472ebed..5fa5c1ee408da5a5da8e7ae848672498a34278de 100644 (file)
--- a/src/libpakfire/include/pakfire/types.h
+++ b/src/libpakfire/include/pakfire/types.h
@@ -22,7 +22,6 @@
 #define PAKFIRE_TYPES_H
 
 typedef struct _Pakfire* Pakfire;
-typedef struct _PakfireArchive* PakfireArchive;
 typedef struct _PakfireFilelist* PakfireFilelist;
 
 #endif /* PAKFIRE_TYPES_H */

diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c
index db200baf22aadb6c701bb7ab3b02d4ef0844d7f3..e7b5db8107f4ce5818cdead87bef85a21563a407 100644 (file)
--- a/src/libpakfire/package.c
+++ b/src/libpakfire/package.c
@@ -978,8 +978,8 @@ PAKFIRE_EXPORT char* pakfire_package_dump(struct pakfire_package* pkg, int flags
        return string;
 }
 
-PAKFIRE_EXPORT PakfireArchive pakfire_package_get_archive(struct pakfire_package* pkg) {
-       PakfireArchive archive;
+PAKFIRE_EXPORT struct pakfire_archive* pakfire_package_get_archive(struct pakfire_package* pkg) {
+       struct pakfire_archive* archive;
 
        // Otherwise open the archive from the cache
        const char* path = pakfire_package_get_path(pkg);

diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index 046197e02b2daff15d40c0b1ea812c8af38b4124..5e065e75007466d5f814ffc8c91bd45b9471409f 100644 (file)
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -799,7 +799,7 @@ PAKFIRE_EXPORT int pakfire_repo_write_solv_fp(struct pakfire_repo* repo, FILE *f
        return repo_write(repo->repo, f);
 }
 
-PAKFIRE_EXPORT struct pakfire_package* pakfire_repo_add_archive(struct pakfire_repo* repo, PakfireArchive archive) {
+PAKFIRE_EXPORT struct pakfire_package* pakfire_repo_add_archive(struct pakfire_repo* repo, struct pakfire_archive* archive) {
        return pakfire_archive_make_package(archive, repo);
 }
 
@@ -829,7 +829,7 @@ PAKFIRE_EXPORT int pakfire_repo_clean(struct pakfire_repo* repo, int flags) {
 static int pakfire_repo_scan_file(struct pakfire_repo* repo, const char* path) {
        DEBUG(repo->pakfire, "Scanning %s...\n", path);
 
-       PakfireArchive archive;
+       struct pakfire_archive* archive;
        int r = pakfire_archive_open(&archive, repo->pakfire, path);
        if (r)
                return r;

diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c
index 3958bb6d59cc4603b84f3ad88c8c6db8c0d7efc0..90ae82a639abc5ed4097b7ff6f6a36cd8f8f9315 100644 (file)
--- a/src/libpakfire/request.c
+++ b/src/libpakfire/request.c
@@ -389,7 +389,7 @@ static int pakfire_request_add_job(struct pakfire_request* request, int action,
 }
 
 static int pakfire_request_add_archive(struct pakfire_request* request, int action,
-               PakfireArchive archive, int extra_flags) {
+               struct pakfire_archive* archive, int extra_flags) {
        struct pakfire_repo* repo = pakfire_repo_create(request->pakfire, "@commandline");
        if (!repo)
                return 1;
@@ -416,7 +416,7 @@ ERROR:
 
 static int pakfire_request_add_file(struct pakfire_request* request, int action,
                const char* path, int extra_flags) {
-       PakfireArchive archive;
+       struct pakfire_archive* archive;
 
        // Open the archive
        int r = pakfire_archive_open(&archive, request->pakfire, path);

diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c
index 109b2e59733fe22d465b3a94a033eec884cdab8f..25bb595521de0906259fddbfff7003dbd6aa931f 100644 (file)
--- a/src/libpakfire/transaction.c
+++ b/src/libpakfire/transaction.c
@@ -47,7 +47,7 @@ struct pakfire_transaction {
        Transaction* transaction;
        char** userinstalled;
 
-       PakfireArchive* archives;
+       struct pakfire_archive** archives;
        struct pakfire_package** packages;
        size_t num;
 };
@@ -574,7 +574,7 @@ PAKFIRE_EXPORT char* pakfire_transaction_dump(struct pakfire_transaction* transa
 }
 
 static int pakfire_transaction_verify(struct pakfire_transaction* transaction,
-               struct pakfire_package* pkg, PakfireArchive archive) {
+               struct pakfire_package* pkg, struct pakfire_archive* archive) {
        // Nothing to do if this step does not have an archive
        if (!archive)
                return 0;
@@ -592,7 +592,7 @@ static int pakfire_transaction_verify(struct pakfire_transaction* transaction,
 }
 
 static int pakfire_transaction_run_script(struct pakfire_transaction* transaction,
-               struct pakfire_db* db, const char* type, struct pakfire_package* pkg, PakfireArchive archive) {
+               struct pakfire_db* db, const char* type, struct pakfire_package* pkg, struct pakfire_archive* archive) {
        struct pakfire_scriptlet* scriptlet = NULL;
 
        // Fetch scriptlet from archive if possible
@@ -614,7 +614,7 @@ static int pakfire_transaction_run_script(struct pakfire_transaction* transactio
 }
 
 static int pakfire_transaction_extract(struct pakfire_transaction* transaction,
-               struct pakfire_package* pkg, PakfireArchive archive) {
+               struct pakfire_package* pkg, struct pakfire_archive* archive) {
        // Extract payload to the root of the Pakfire instance
        int r = pakfire_archive_extract(archive, NULL);
        if (r) {
@@ -713,7 +713,7 @@ static int pakfire_transaction_package_is_userinstalled(
 }
 
 static int pakfire_transaction_run_step(struct pakfire_transaction* transaction,
-               struct pakfire_db* db, const enum pakfire_actions action, struct pakfire_package* pkg, PakfireArchive archive) {
+               struct pakfire_db* db, const enum pakfire_actions action, struct pakfire_package* pkg, struct pakfire_archive* archive) {
        if (!pkg) {
                errno = EINVAL;
                return 1;

diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c
index eae7f612aed7d7d5a11553ffcc2f12ab5a9db8c8..41c53166dc53d568c1d3dbda6d8c1d8278e17c08 100644 (file)
--- a/tests/libpakfire/archive.c
+++ b/tests/libpakfire/archive.c
@@ -36,7 +36,7 @@ static int test_open(const struct test* t) {
        LOG("Trying to open %s\n", path);
 
        // Open the archive
-       PakfireArchive archive;
+       struct pakfire_archive* archive;
        ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path));
 
        // Verify the archive
@@ -52,7 +52,7 @@ static int test_filelist(const struct test* t) {
        const char* path = TEST_SRC_PATH TEST_PKG1_PATH;
 
        // Open the archive
-       PakfireArchive archive;
+       struct pakfire_archive* archive;
        ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path));
 
        // Fetch the filelist
@@ -71,7 +71,7 @@ static int test_filelist(const struct test* t) {
 static int test_extract(const struct test* t) {
        const char* path = TEST_SRC_PATH TEST_PKG1_PATH;
 
-       PakfireArchive archive;
+       struct pakfire_archive* archive;
        ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path));
 
        // Extract the archive payload
@@ -94,7 +94,7 @@ static int test_extract(const struct test* t) {
 static int test_import(const struct test* t) {
        const char* path = TEST_SRC_PATH TEST_PKG1_PATH;
 
-       PakfireArchive archive;
+       struct pakfire_archive* archive;
        ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path));
 
        struct pakfire_repo* repo = pakfire_repo_create(t->pakfire, "tmp");

diff --git a/tests/libpakfire/db.c b/tests/libpakfire/db.c
index 921f6d3774fbbe4ce46a21a4c61b617d8e2a40f6..13abedf2b89c7f10438b01c0c2d264d12e6631a6 100644 (file)
--- a/tests/libpakfire/db.c
+++ b/tests/libpakfire/db.c
@@ -78,7 +78,7 @@ static int test_add_package(const struct test* t) {
        const char* path = TEST_SRC_PATH "/data/beep-1.3-2.ip3.x86_64.pfm";
 
        // Open archive
-       PakfireArchive archive;
+       struct pakfire_archive* archive;
        ASSERT_SUCCESS(pakfire_archive_open(&archive, t->pakfire, path));
        ASSERT(archive);