file: Create its own type

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

diff --git a/src/cli/lib/lint.c b/src/cli/lib/lint.c
index 75cf469aba5a1ff2a1cfeeb40d4b6d2ac579d4d2..94f30f05431678c371e08744c298d29018c3efaa 100644 (file)
--- a/src/cli/lib/lint.c
+++ b/src/cli/lib/lint.c
@@ -61,7 +61,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) {
 }
 
 static int cli_linter_result(pakfire_ctx* ctx, pakfire_archive* archive,
-               struct pakfire_package* package, struct pakfire_file* file, int priority,
+               struct pakfire_package* package, pakfire_file* file, int priority,
                const char* result, void* data) {
        const char* nevra = pakfire_package_get_string(package, PAKFIRE_PKG_NEVRA);
 

diff --git a/src/pakfire/archive.c b/src/pakfire/archive.c
index 6966d3ea61e3784eef5a686bf0d70b681fb4fcfd..39637e0b67fe99df27832b9eabef090f317c759d 100644 (file)
--- a/src/pakfire/archive.c
+++ b/src/pakfire/archive.c
@@ -1186,7 +1186,7 @@ static void pakfire_extract_progress(void* data) {
 
 static int pakfire_archive_extract_one(pakfire_archive* archive,
                struct archive* a, struct archive_entry* entry, void* data) {
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        struct vfs_cap_data cap_data = {};
        char buffer[PATH_MAX];
        int r;
@@ -1442,7 +1442,7 @@ unsigned int pakfire_archive_get_format(pakfire_archive* archive) {
 static int __pakfire_archive_load_filelist(pakfire_archive* archive,
                struct archive* a, struct archive_entry* entry, void* data) {
        pakfire_filelist* filelist = data;
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        int r;
 
        // Generate a file object

diff --git a/src/pakfire/archive_writer.c b/src/pakfire/archive_writer.c
index 4cf4353d30310bc7d50c803f81badc38a0fc2078..39bace0ab2bad41187101bcd35c35787cfc08b2e 100644 (file)
--- a/src/pakfire/archive_writer.c
+++ b/src/pakfire/archive_writer.c
@@ -395,7 +395,7 @@ static int pakfire_archive_writer_write_payload(
 }
 
 static int pakfire_archive_writer_write_entry(pakfire_archive_writer* self,
-               struct pakfire_file* file, struct archive_entry* entry) {
+               pakfire_file* file, struct archive_entry* entry) {
        FILE* f = NULL;
        int r;
 
@@ -454,7 +454,7 @@ ERROR:
 }
 
 static int pakfire_archive_writer_write_file(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        pakfire_archive_writer* self = data;
        struct archive_entry* sparse_entry = NULL;
        struct archive_entry* entry = NULL;

diff --git a/src/pakfire/build.c b/src/pakfire/build.c
index 1fe6efc11ac416a743bcb724f84c9b9e4e715cdf..1da44023c9523cc9c94784096026964ba3d496d3 100644 (file)
--- a/src/pakfire/build.c
+++ b/src/pakfire/build.c
@@ -414,7 +414,7 @@ static int pakfire_build_process_pkgconfig_requires(pakfire_ctx* ctx, void* data
 }
 
 static int pakfire_build_find_pkgconfig_provides(
-               pakfire_ctx* ctx, struct pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
+               pakfire_ctx* ctx, pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
        int r;
 
        // Fetch the absolute path
@@ -439,7 +439,7 @@ static int pakfire_build_find_pkgconfig_provides(
 }
 
 static int pakfire_build_find_pkgconfig_requires(
-               pakfire_ctx* ctx, struct pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
+               pakfire_ctx* ctx, pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
        pakfire_env* env = NULL;
        int r;
 
@@ -494,7 +494,7 @@ ERROR:
 }
 
 static int pakfire_build_find_elf_provides(
-               pakfire_ctx* ctx, struct pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
+               pakfire_ctx* ctx, pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
        pakfire_elf* elf = NULL;
        char** provides = NULL;
        int r;
@@ -545,7 +545,7 @@ ERROR:
 }
 
 static int pakfire_build_find_elf_requires(
-               pakfire_ctx* ctx, struct pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
+               pakfire_ctx* ctx, pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
        pakfire_elf* elf = NULL;
        char** requires = NULL;
        int r;
@@ -600,7 +600,7 @@ ERROR:
 }
 
 static int pakfire_build_find_python_abi_requires(
-               pakfire_ctx* ctx, struct pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
+               pakfire_ctx* ctx, pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
        char basename[PATH_MAX];
        const char* p = NULL;
        int r;
@@ -631,7 +631,7 @@ static int pakfire_build_find_python_abi_requires(
 }
 
 static int pakfire_build_find_symlink_destinations(
-               pakfire_ctx* ctx, struct pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
+               pakfire_ctx* ctx, pakfire_file* file, struct pakfire_find_deps_ctx* deps) {
        const char* symlink = NULL;
        const char* path = NULL;
        char buffer[PATH_MAX];
@@ -661,7 +661,7 @@ static int pakfire_build_find_symlink_destinations(
 }
 
 static int pakfire_build_find_provides(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct pakfire_find_deps_ctx* deps = data;
        int r;
 
@@ -692,7 +692,7 @@ static int pakfire_build_find_provides(
 }
 
 static int pakfire_build_find_requires(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct pakfire_find_deps_ctx* deps = data;
        int r;
 
@@ -744,7 +744,7 @@ static int pakfire_build_find_requires(
 */
 
 static int pakfire_build_find_perl_files(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        pakfire_filelist* perlfiles = data;
 
        // Add all perl files
@@ -901,7 +901,7 @@ ERROR:
 }
 
 static int __pakfire_build_package_mark_config_files(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        char** configfiles = data;
        int r;
 
@@ -1505,7 +1505,7 @@ ERROR:
 }
 
 static int __pakfire_build_remove_static_libraries(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        const pakfire_build_post_process_state* state = data;
        char path[PATH_MAX];
        int r;
@@ -1539,7 +1539,7 @@ static int pakfire_build_post_remove_static_libraries(
 }
 
 static int __pakfire_build_remove_libtool_archives(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        const pakfire_build_post_process_state* state = data;
 
        // Find all libtool archive files
@@ -1558,7 +1558,7 @@ static int pakfire_build_post_remove_libtool_archives(
 }
 
 static int __pakfire_build_check_broken_symlinks(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        const pakfire_build_post_process_state* state = data;
        int r;
 
@@ -1590,7 +1590,7 @@ static int pakfire_build_post_check_broken_symlinks(
 }
 
 static int pakfire_build_fix_script_interpreter(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        // Only run this for regular files
        switch (pakfire_file_get_type(file)) {
                case S_IFREG:
@@ -1614,7 +1614,7 @@ static int pakfire_build_fix_script_interpreter(
 }
 
 static int pakfire_build_check_buildroot(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        const pakfire_build_post_process_state* state = data;
        int r;
 
@@ -2292,7 +2292,7 @@ ERROR:
 }
 
 static int __pakfire_build_unpackaged_file(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* p) {
+               pakfire_ctx* ctx, pakfire_file* file, void* p) {
        char* s = pakfire_file_dump(file, PAKFIRE_FILE_DUMP_FULL);
        if (s) {
                ERROR(ctx, "%s\n", s);

diff --git a/src/pakfire/db.c b/src/pakfire/db.c
index da758e872b99d32260ba86b64b46a480f2e04051..7e3574022c736c5b0d38ce505366d80b49205575 100644 (file)
--- a/src/pakfire/db.c
+++ b/src/pakfire/db.c
@@ -993,7 +993,7 @@ END:
 }
 
 static int pakfire_db_bind_checksum(pakfire_db* db, sqlite3_stmt* stmt,
-               const int field, struct pakfire_file* file, const enum pakfire_hash_type type) {
+               const int field, pakfire_file* file, const enum pakfire_hash_type type) {
        const unsigned char* checksum = NULL;
        size_t checksum_length = 0;
        int r;
@@ -1062,7 +1062,7 @@ static int pakfire_db_add_files(pakfire_db* db, unsigned long id, pakfire_archiv
        }
 
        for (unsigned int i = 0; i < pakfire_filelist_length(filelist); i++) {
-               struct pakfire_file* file = pakfire_filelist_get(filelist, i);
+               pakfire_file* file = pakfire_filelist_get(filelist, i);
 
                // Bind package ID
                r = sqlite3_bind_int64(stmt, 1, id);
@@ -2199,7 +2199,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_db_load_file_checksum(pakfire_db* db, struct pakfire_file* file,
+static int pakfire_db_load_file_checksum(pakfire_db* db, pakfire_file* file,
                sqlite3_stmt* stmt, const enum pakfire_hash_type type, const int field) {
        // Fetch checksum
        const unsigned char* checksum = sqlite3_column_blob(stmt, field);
@@ -2217,7 +2217,7 @@ static int pakfire_db_load_file_checksum(pakfire_db* db, struct pakfire_file* fi
 
 static int pakfire_db_load_file(pakfire_db* db, pakfire_filelist* filelist,
                sqlite3_stmt* stmt) {
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        int r;
 
        // Path

diff --git a/src/pakfire/elf.c b/src/pakfire/elf.c
index 9180c9665a9e9749a3edf26e492d2ea494a7036f..9a33a7152761e3f46cecea3b955a9ce46b0f1aa1 100644 (file)
--- a/src/pakfire/elf.c
+++ b/src/pakfire/elf.c
@@ -191,7 +191,7 @@ ERROR:
 }
 
 int pakfire_elf_open_file(pakfire_elf** elf,
-               pakfire_ctx* ctx, struct pakfire_file* file) {
+               pakfire_ctx* ctx, pakfire_file* file) {
        const char* path = NULL;
        int fd = -EBADF;
        int r;

diff --git a/src/pakfire/elf.h b/src/pakfire/elf.h
index 9b0fe684cdea96f794f27e9d8ea8d4bc275ac904..b0f0927ba1245964852f35ae4593aa0a961df446 100644 (file)
--- a/src/pakfire/elf.h
+++ b/src/pakfire/elf.h
@@ -29,7 +29,7 @@ typedef struct pakfire_elf pakfire_elf;
 int pakfire_elf_open(pakfire_elf** elf,
        pakfire_ctx* ctx, const char* path, int fd);
 int pakfire_elf_open_file(pakfire_elf** elf,
-       pakfire_ctx* ctx, struct pakfire_file* file);
+       pakfire_ctx* ctx, pakfire_file* file);
 
 pakfire_elf* pakfire_elf_ref(pakfire_elf* self);
 pakfire_elf* pakfire_elf_unref(pakfire_elf* self);

diff --git a/src/pakfire/fhs.c b/src/pakfire/fhs.c
index 55631be6c20126bda96422511760b13cdb1d7969..cfdf4047f5e7d76efef55a865d9aa194cb57e61f 100644 (file)
--- a/src/pakfire/fhs.c
+++ b/src/pakfire/fhs.c
@@ -202,7 +202,7 @@ static const struct pakfire_fhs_check {
 };
 
 static const struct pakfire_fhs_check* pakfire_fhs_find_check(
-               pakfire_ctx* ctx, struct pakfire_file* file) {
+               pakfire_ctx* ctx, pakfire_file* file) {
        const struct pakfire_fhs_check* check = NULL;
        char path[PATH_MAX];
        int r;
@@ -247,7 +247,7 @@ ERROR:
 }
 
 static int pakfire_fhs_check_world_writable(
-               pakfire_ctx* ctx, struct pakfire_file* file) {
+               pakfire_ctx* ctx, pakfire_file* file) {
        // Run this check only for regular files
        switch (pakfire_file_get_type(file)) {
                case S_IFREG:
@@ -273,7 +273,7 @@ static int pakfire_fhs_check_world_writable(
 }
 
 static int pakfire_fhs_check_perms(pakfire_ctx* ctx,
-               const struct pakfire_fhs_check* check, struct pakfire_file* file) {
+               const struct pakfire_fhs_check* check, pakfire_file* file) {
        // No permissions defined. Skipping check...
        if (!check->perms)
                return 0;
@@ -294,7 +294,7 @@ static int pakfire_fhs_check_perms(pakfire_ctx* ctx,
 }
 
 static int pakfire_fhs_check_ownership(pakfire_ctx* ctx,
-               const struct pakfire_fhs_check* check, struct pakfire_file* file) {
+               const struct pakfire_fhs_check* check, pakfire_file* file) {
        const char* path = pakfire_file_get_path(file);
 
        // Check uname
@@ -326,7 +326,7 @@ static int pakfire_fhs_check_ownership(pakfire_ctx* ctx,
 }
 
 static int pakfire_fhs_check_noexec(pakfire_ctx* ctx,
-               const struct pakfire_fhs_check* check, struct pakfire_file* file) {
+               const struct pakfire_fhs_check* check, pakfire_file* file) {
        // Skip this check if PAKFIRE_FHS_CHECK_NOEXEC is not set
        if (!(check->flags & PAKFIRE_FHS_CHECK_NOEXEC))
                return 0;
@@ -346,7 +346,7 @@ static int pakfire_fhs_check_noexec(pakfire_ctx* ctx,
        return 0;
 }
 
-int pakfire_fhs_check_file(pakfire_ctx* ctx, struct pakfire_file* file) {
+int pakfire_fhs_check_file(pakfire_ctx* ctx, pakfire_file* file) {
        const struct pakfire_fhs_check* check = NULL;
        int status = 0;
        int r;

diff --git a/src/pakfire/fhs.h b/src/pakfire/fhs.h
index 88ebb259983ac65ca66a9e2eff541671b5e6ca2c..8a88981fe08eea99da65055ea1af16dc107f83d7 100644 (file)
--- a/src/pakfire/fhs.h
+++ b/src/pakfire/fhs.h
@@ -33,6 +33,6 @@ enum pakfire_fhs_status {
        PAKFIRE_FHS_NOEXEC         = (1 << 5),
 };
 
-int pakfire_fhs_check_file(pakfire_ctx* ctx, struct pakfire_file* file);
+int pakfire_fhs_check_file(pakfire_ctx* ctx, pakfire_file* file);
 
 #endif /* PAKFIRE_FHS_H */

diff --git a/src/pakfire/file.c b/src/pakfire/file.c
index bae7d6ddee13375b1634f242d0657b79dfdbf081..445b07883bf5367bad4c878444ea2e7bcda71c7a 100644 (file)
--- a/src/pakfire/file.c
+++ b/src/pakfire/file.c
@@ -97,7 +97,7 @@ struct pakfire_file {
 /*
        Capabilities
 */
-static int pakfire_file_read_fcaps(struct pakfire_file* file,
+static int pakfire_file_read_fcaps(pakfire_file* file,
                const struct vfs_cap_data* cap_data, size_t length) {
        int max = 0;
        int r;
@@ -211,7 +211,7 @@ ERROR:
        return r;
 }
 
-int pakfire_file_write_fcaps(struct pakfire_file* file, struct vfs_cap_data* cap_data) {
+int pakfire_file_write_fcaps(pakfire_file* file, struct vfs_cap_data* cap_data) {
        cap_flag_value_t cap_permitted;
        cap_flag_value_t cap_inheritable;
        cap_flag_value_t cap_effective;
@@ -271,7 +271,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_file_from_archive_entry(struct pakfire_file* file, struct archive_entry* entry) {
+static int pakfire_file_from_archive_entry(pakfire_file* file, struct archive_entry* entry) {
        char path[PATH_MAX];
        char* buffer = NULL;
        const char* attr = NULL;
@@ -377,9 +377,9 @@ ERROR:
        return r;
 }
 
-int pakfire_file_create(struct pakfire_file** file,
+int pakfire_file_create(pakfire_file** file,
                struct pakfire* pakfire, const char* path) {
-       struct pakfire_file* f = NULL;
+       pakfire_file* f = NULL;
        int r = 0;
 
        // Allocate a new object
@@ -420,7 +420,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_file_compute_hashes(struct pakfire_file* file,
+static int pakfire_file_compute_hashes(pakfire_file* file,
                const enum pakfire_hash_type types, struct pakfire_hashes* hashes) {
        FILE* f = NULL;
        int r;
@@ -453,9 +453,9 @@ ERROR:
        return r;
 }
 
-int pakfire_file_create_from_archive_entry(struct pakfire_file** file, struct pakfire* pakfire,
+int pakfire_file_create_from_archive_entry(pakfire_file** file, struct pakfire* pakfire,
                struct archive_entry* entry) {
-       struct pakfire_file* f = NULL;
+       pakfire_file* f = NULL;
        int r;
 
        r = pakfire_file_create(&f, pakfire, NULL);
@@ -477,7 +477,7 @@ ERROR:
        return r;
 }
 
-struct archive_entry* pakfire_file_archive_entry(struct pakfire_file* file, const enum pakfire_hash_type hashes) {
+struct archive_entry* pakfire_file_archive_entry(pakfire_file* file, const enum pakfire_hash_type hashes) {
        struct archive_entry* entry = NULL;
        struct vfs_cap_data cap_data = {};
        int r;
@@ -559,7 +559,7 @@ ERROR:
        return NULL;
 }
 
-static void pakfire_file_free(struct pakfire_file* file) {
+static void pakfire_file_free(pakfire_file* file) {
        // Free capabilities
        if (file->caps)
                cap_free(file->caps);
@@ -572,13 +572,13 @@ static void pakfire_file_free(struct pakfire_file* file) {
        free(file);
 }
 
-struct pakfire_file* pakfire_file_ref(struct pakfire_file* file) {
+pakfire_file* pakfire_file_ref(pakfire_file* file) {
        file->nrefs++;
 
        return file;
 }
 
-struct pakfire_file* pakfire_file_unref(struct pakfire_file* file) {
+pakfire_file* pakfire_file_unref(pakfire_file* file) {
        if (--file->nrefs > 0)
                return file;
 
@@ -590,11 +590,11 @@ struct pakfire_file* pakfire_file_unref(struct pakfire_file* file) {
        Flags
 */
 
-int pakfire_file_has_flag(struct pakfire_file* file, int flag) {
+int pakfire_file_has_flag(pakfire_file* file, int flag) {
        return file->flags & flag;
 }
 
-int pakfire_file_set_flags(struct pakfire_file* file, int flag) {
+int pakfire_file_set_flags(pakfire_file* file, int flag) {
        file->flags |= flag;
 
        return 0;
@@ -603,7 +603,7 @@ int pakfire_file_set_flags(struct pakfire_file* file, int flag) {
 #define pakfire_file_strmode(file, buffer) \
        __pakfire_file_strmode(file, buffer, sizeof(buffer))
 
-static int __pakfire_file_strmode(struct pakfire_file* file, char* s, const size_t length) {
+static int __pakfire_file_strmode(pakfire_file* file, char* s, const size_t length) {
        const char* hardlink = NULL;
        int r;
 
@@ -701,7 +701,7 @@ static int __pakfire_file_strmode(struct pakfire_file* file, char* s, const size
        return 0;
 }
 
-char* pakfire_file_dump(struct pakfire_file* file, int flags) {
+char* pakfire_file_dump(pakfire_file* file, int flags) {
        char buffer[LINE_MAX] = "";
        char mode[12];
        char time[32];
@@ -771,22 +771,22 @@ char* pakfire_file_dump(struct pakfire_file* file, int flags) {
        return strdup(buffer);
 }
 
-int pakfire_file_cmp(struct pakfire_file* file1, struct pakfire_file* file2) {
+int pakfire_file_cmp(pakfire_file* file1, pakfire_file* file2) {
        const char* path1 = pakfire_file_get_path(file1);
        const char* path2 = pakfire_file_get_path(file2);
 
        return strcmp(path1, path2);
 }
 
-const char* pakfire_file_get_abspath(struct pakfire_file* file) {
+const char* pakfire_file_get_abspath(pakfire_file* file) {
        return archive_entry_sourcepath(file->entry);
 }
 
-const char* pakfire_file_get_path(struct pakfire_file* file) {
+const char* pakfire_file_get_path(pakfire_file* file) {
        return archive_entry_pathname(file->entry);
 }
 
-int pakfire_file_set_path(struct pakfire_file* file, const char* path) {
+int pakfire_file_set_path(pakfire_file* file, const char* path) {
        char buffer[PATH_MAX];
        int r = 0;
 
@@ -820,115 +820,115 @@ int pakfire_file_set_path(struct pakfire_file* file, const char* path) {
        return 0;
 }
 
-const char* pakfire_file_get_hardlink(struct pakfire_file* file) {
+const char* pakfire_file_get_hardlink(pakfire_file* file) {
        return archive_entry_hardlink(file->entry);
 }
 
-void pakfire_file_set_hardlink(struct pakfire_file* file, const char* link) {
+void pakfire_file_set_hardlink(pakfire_file* file, const char* link) {
        archive_entry_set_hardlink(file->entry, link);
 }
 
-const char* pakfire_file_get_symlink(struct pakfire_file* file) {
+const char* pakfire_file_get_symlink(pakfire_file* file) {
        return archive_entry_symlink(file->entry);
 }
 
-void pakfire_file_set_symlink(struct pakfire_file* file, const char* link) {
+void pakfire_file_set_symlink(pakfire_file* file, const char* link) {
        archive_entry_set_symlink(file->entry, link);
 }
 
-nlink_t pakfire_file_get_nlink(struct pakfire_file* file) {
+nlink_t pakfire_file_get_nlink(pakfire_file* file) {
        return archive_entry_nlink(file->entry);
 }
 
-void pakfire_file_set_nlink(struct pakfire_file* file, const nlink_t nlink) {
+void pakfire_file_set_nlink(pakfire_file* file, const nlink_t nlink) {
        archive_entry_set_nlink(file->entry, nlink);
 }
 
-ino_t pakfire_file_get_inode(struct pakfire_file* file) {
+ino_t pakfire_file_get_inode(pakfire_file* file) {
        return archive_entry_ino64(file->entry);
 }
 
-void pakfire_file_set_inode(struct pakfire_file* file, const ino_t ino) {
+void pakfire_file_set_inode(pakfire_file* file, const ino_t ino) {
        archive_entry_set_ino64(file->entry, ino);
 }
 
-dev_t pakfire_file_get_dev(struct pakfire_file* file) {
+dev_t pakfire_file_get_dev(pakfire_file* file) {
        return archive_entry_dev(file->entry);
 }
 
-void pakfire_file_set_dev(struct pakfire_file* file, const dev_t dev) {
+void pakfire_file_set_dev(pakfire_file* file, const dev_t dev) {
        archive_entry_set_dev(file->entry, dev);
 }
 
-int pakfire_file_get_type(struct pakfire_file* file) {
+int pakfire_file_get_type(pakfire_file* file) {
        return archive_entry_filetype(file->entry);
 }
 
-off_t pakfire_file_get_size(struct pakfire_file* file) {
+off_t pakfire_file_get_size(pakfire_file* file) {
        return archive_entry_size(file->entry);
 }
 
-void pakfire_file_set_size(struct pakfire_file* file, off_t size) {
+void pakfire_file_set_size(pakfire_file* file, off_t size) {
        archive_entry_set_size(file->entry, size);
 }
 
-const char* pakfire_file_get_uname(struct pakfire_file* file) {
+const char* pakfire_file_get_uname(pakfire_file* file) {
        return archive_entry_uname(file->entry);
 }
 
-int pakfire_file_set_uname(struct pakfire_file* file, const char* uname) {
+int pakfire_file_set_uname(pakfire_file* file, const char* uname) {
        archive_entry_set_uname(file->entry, uname);
 
        return 0;
 }
 
-const char* pakfire_file_get_gname(struct pakfire_file* file) {
+const char* pakfire_file_get_gname(pakfire_file* file) {
        return archive_entry_gname(file->entry);
 }
 
-int pakfire_file_set_gname(struct pakfire_file* file, const char* gname) {
+int pakfire_file_set_gname(pakfire_file* file, const char* gname) {
        archive_entry_set_gname(file->entry, gname);
 
        return 0;
 }
 
-mode_t pakfire_file_get_mode(struct pakfire_file* file) {
+mode_t pakfire_file_get_mode(pakfire_file* file) {
        return archive_entry_mode(file->entry);
 }
 
-void pakfire_file_set_mode(struct pakfire_file* file, mode_t mode) {
+void pakfire_file_set_mode(pakfire_file* file, mode_t mode) {
        archive_entry_set_mode(file->entry, mode);
 }
 
-mode_t pakfire_file_get_perms(struct pakfire_file* file) {
+mode_t pakfire_file_get_perms(pakfire_file* file) {
        return archive_entry_perm(file->entry);
 }
 
-void pakfire_file_set_perms(struct pakfire_file* file, const mode_t perms) {
+void pakfire_file_set_perms(pakfire_file* file, const mode_t perms) {
        archive_entry_set_mode(file->entry, pakfire_file_get_type(file) | perms);
 }
 
-int pakfire_file_is_executable(struct pakfire_file* file) {
+int pakfire_file_is_executable(pakfire_file* file) {
        return pakfire_file_get_mode(file) & (S_IXUSR|S_IXGRP|S_IXOTH);
 }
 
-time_t pakfire_file_get_ctime(struct pakfire_file* file) {
+time_t pakfire_file_get_ctime(pakfire_file* file) {
        return archive_entry_ctime(file->entry);
 }
 
-void pakfire_file_set_ctime(struct pakfire_file* file, time_t time) {
+void pakfire_file_set_ctime(pakfire_file* file, time_t time) {
        archive_entry_set_ctime(file->entry, time, 0);
 }
 
-time_t pakfire_file_get_mtime(struct pakfire_file* file) {
+time_t pakfire_file_get_mtime(pakfire_file* file) {
        return archive_entry_mtime(file->entry);
 }
 
-void pakfire_file_set_mtime(struct pakfire_file* file, time_t time) {
+void pakfire_file_set_mtime(pakfire_file* file, time_t time) {
        archive_entry_set_mtime(file->entry, time, 0);
 }
 
-int pakfire_file_has_payload(struct pakfire_file* file) {
+int pakfire_file_has_payload(pakfire_file* file) {
        // File must be a regular file
        switch (pakfire_file_get_type(file)) {
                case S_IFREG:
@@ -942,7 +942,7 @@ int pakfire_file_has_payload(struct pakfire_file* file) {
        return pakfire_file_get_size(file) > 0;
 }
 
-int pakfire_file_get_checksum(struct pakfire_file* file, const enum pakfire_hash_type type,
+int pakfire_file_get_checksum(pakfire_file* file, const enum pakfire_hash_type type,
                const unsigned char** checksum, size_t* checksum_length) {
        int r;
 
@@ -957,7 +957,7 @@ int pakfire_file_get_checksum(struct pakfire_file* file, const enum pakfire_hash
        return 0;
 }
 
-int pakfire_file_set_checksum(struct pakfire_file* file, const enum pakfire_hash_type type,
+int pakfire_file_set_checksum(pakfire_file* file, const enum pakfire_hash_type type,
                const unsigned char* checksum, const size_t checksum_length) {
        int r;
 
@@ -976,14 +976,14 @@ int pakfire_file_set_checksum(struct pakfire_file* file, const enum pakfire_hash
        return 0;
 }
 
-int pakfire_file_has_caps(struct pakfire_file* file) {
+int pakfire_file_has_caps(pakfire_file* file) {
        if (file->caps)
                return 1;
 
        return 0;
 }
 
-char* pakfire_file_get_caps(struct pakfire_file* file) {
+char* pakfire_file_get_caps(pakfire_file* file) {
        char* copy = NULL;
        char* text = NULL;
        ssize_t length = 0;
@@ -1008,7 +1008,7 @@ ERROR:
        return copy;
 }
 
-static int pakfire_file_levels(struct pakfire_file* file) {
+static int pakfire_file_levels(pakfire_file* file) {
        const char* path = pakfire_file_get_path(file);
        if (!path)
                return 0;
@@ -1023,7 +1023,7 @@ static int pakfire_file_levels(struct pakfire_file* file) {
        return levels;
 }
 
-int pakfire_file_open(struct pakfire_file* file, int flags) {
+int pakfire_file_open(pakfire_file* file, int flags) {
        const char* path = NULL;
        int fd = -EBADF;
 
@@ -1049,7 +1049,7 @@ int pakfire_file_open(struct pakfire_file* file, int flags) {
        return fd;
 }
 
-FILE* pakfire_file_fopen(struct pakfire_file* file, const char* mode) {
+FILE* pakfire_file_fopen(pakfire_file* file, const char* mode) {
        const char* path = NULL;
        FILE* f = NULL;
 
@@ -1072,7 +1072,7 @@ FILE* pakfire_file_fopen(struct pakfire_file* file, const char* mode) {
 /*
        Opens the file and returns a mapping of the payload in memory
 */
-static int pakfire_file_mmap(struct pakfire_file* file, char** data, size_t* length) {
+static int pakfire_file_mmap(pakfire_file* file, char** data, size_t* length) {
        int fd = -EBADF;
        int r;
 
@@ -1095,7 +1095,7 @@ ERROR:
        return r;
 }
 
-int pakfire_file_contains(struct pakfire_file* file, const char* needle, ssize_t length) {
+int pakfire_file_contains(pakfire_file* file, const char* needle, ssize_t length) {
        char* haystack = NULL;
        size_t l = 0;
        int pos;
@@ -1142,7 +1142,7 @@ ERROR:
        return r;
 }
 
-static int pakfire_file_remove(struct pakfire_file* file) {
+static int pakfire_file_remove(pakfire_file* file) {
        int r;
 
        const char* path    = pakfire_file_get_path(file);
@@ -1204,7 +1204,7 @@ static int pakfire_file_remove(struct pakfire_file* file) {
        return r;
 }
 
-int pakfire_file_symlink_target_exists(struct pakfire_file* file) {
+int pakfire_file_symlink_target_exists(pakfire_file* file) {
        const mode_t mode = pakfire_file_get_mode(file);
 
        // Fail if this got called for anything that isn't a symlink
@@ -1220,7 +1220,7 @@ int pakfire_file_symlink_target_exists(struct pakfire_file* file) {
        MIME Type
 */
 
-int pakfire_file_detect_mimetype(struct pakfire_file* file) {
+int pakfire_file_detect_mimetype(pakfire_file* file) {
        const mode_t mode = pakfire_file_get_mode(file);
 
        // Only process regular files
@@ -1252,7 +1252,7 @@ int pakfire_file_detect_mimetype(struct pakfire_file* file) {
        return pakfire_file_set_mimetype(file, mimetype);
 }
 
-const char* pakfire_file_get_mimetype(struct pakfire_file* file) {
+const char* pakfire_file_get_mimetype(pakfire_file* file) {
        // Return nothing on an empty mimetype
        if (!*file->mimetype)
                return NULL;
@@ -1261,7 +1261,7 @@ const char* pakfire_file_get_mimetype(struct pakfire_file* file) {
 }
 
 int pakfire_file_set_mimetype(
-               struct pakfire_file* file, const char* mimetype) {
+               pakfire_file* file, const char* mimetype) {
        // Store the value
        return pakfire_string_set(file->mimetype, mimetype);
 }
@@ -1270,7 +1270,7 @@ int pakfire_file_set_mimetype(
        Classification
 */
 
-static int pakfire_file_classify_mode(struct pakfire_file* file) {
+static int pakfire_file_classify_mode(pakfire_file* file) {
        const mode_t mode = pakfire_file_get_mode(file);
 
        // Check for regular files
@@ -1316,7 +1316,7 @@ static const struct pattern {
        { NULL },
 };
 
-static int pakfire_file_classify_pattern(struct pakfire_file* file) {
+static int pakfire_file_classify_pattern(pakfire_file* file) {
        for (const struct pattern* p = patterns; p->pattern; p++) {
                if (pakfire_file_matches(file, p->pattern)) {
                        file->class |= p->class;
@@ -1335,7 +1335,7 @@ static const struct mimetype {
        { NULL, 0 },
 };
 
-static int pakfire_file_classify_magic(struct pakfire_file* file) {
+static int pakfire_file_classify_magic(pakfire_file* file) {
        int r;
 
        // Detect the MIME type
@@ -1359,7 +1359,7 @@ static int pakfire_file_classify_magic(struct pakfire_file* file) {
        return 0;
 }
 
-static int pakfire_file_classify_elf(struct pakfire_file* file) {
+static int pakfire_file_classify_elf(pakfire_file* file) {
        pakfire_elf* elf = NULL;
        int r;
 
@@ -1390,7 +1390,7 @@ ERROR:
        return r;
 }
 
-int pakfire_file_classify(struct pakfire_file* file) {
+int pakfire_file_classify(pakfire_file* file) {
        int r;
 
        if (!file->class) {
@@ -1427,7 +1427,7 @@ ERROR:
        return r;
 }
 
-int pakfire_file_matches_class(struct pakfire_file* file, const int class) {
+int pakfire_file_matches_class(pakfire_file* file, const int class) {
        return pakfire_file_classify(file) & class;
 }
 
@@ -1437,7 +1437,7 @@ int pakfire_file_matches_class(struct pakfire_file* file, const int class) {
        It will try to delete any parent directories as well and ignore if directories
        cannot be deleted because they might contain other files
 */
-int pakfire_file_cleanup(struct pakfire_file* file, int flags) {
+int pakfire_file_cleanup(pakfire_file* file, int flags) {
        char path[PATH_MAX];
 
        // Try removing the file
@@ -1478,7 +1478,7 @@ int pakfire_file_cleanup(struct pakfire_file* file, int flags) {
        return 0;
 }
 
-static int pakfire_file_verify_mode(struct pakfire_file* file, const struct stat* st) {
+static int pakfire_file_verify_mode(pakfire_file* file, const struct stat* st) {
        const mode_t type = pakfire_file_get_type(file);
 
        // Did the type change?
@@ -1515,7 +1515,7 @@ static int pakfire_file_verify_mode(struct pakfire_file* file, const struct stat
        return 0;
 }
 
-static int pakfire_file_verify_size(struct pakfire_file* file, const struct stat* st) {
+static int pakfire_file_verify_size(pakfire_file* file, const struct stat* st) {
        const ssize_t size = pakfire_file_get_size(file);
 
        // Nothing to do if size matches
@@ -1531,7 +1531,7 @@ static int pakfire_file_verify_size(struct pakfire_file* file, const struct stat
        return 0;
 }
 
-static int pakfire_file_verify_ownership(struct pakfire_file* file, const struct stat* st) {
+static int pakfire_file_verify_ownership(pakfire_file* file, const struct stat* st) {
        // Fetch UID/GID
 #if 0
        const uid_t uid = pakfire_unmap_id(file->pakfire, st->st_uid);
@@ -1565,7 +1565,7 @@ static int pakfire_file_verify_ownership(struct pakfire_file* file, const struct
        return 0;
 }
 
-static int pakfire_file_verify_timestamps(struct pakfire_file* file, const struct stat* st) {
+static int pakfire_file_verify_timestamps(pakfire_file* file, const struct stat* st) {
        const time_t ctime = pakfire_file_get_ctime(file);
        const time_t mtime = pakfire_file_get_mtime(file);
 
@@ -1586,7 +1586,7 @@ static int pakfire_file_verify_timestamps(struct pakfire_file* file, const struc
        return 0;
 }
 
-static int pakfire_file_verify_payload(struct pakfire_file* file, const struct stat* st) {
+static int pakfire_file_verify_payload(pakfire_file* file, const struct stat* st) {
        struct pakfire_hashes computed_hashes = {};
        int r;
 
@@ -1625,7 +1625,7 @@ static int pakfire_file_verify_payload(struct pakfire_file* file, const struct s
 /*
        Verify the file - i.e. does the metadata match what is on disk?
 */
-int pakfire_file_verify(struct pakfire_file* file, int* status) {
+int pakfire_file_verify(pakfire_file* file, int* status) {
        struct stat st;
        int r;
 
@@ -1674,7 +1674,7 @@ int pakfire_file_verify(struct pakfire_file* file, int* status) {
        return 0;
 }
 
-int pakfire_file_matches(struct pakfire_file* file, const char* pattern) {
+int pakfire_file_matches(pakfire_file* file, const char* pattern) {
        // Don't match on no pattern
        if (!pattern)
                return 0;
@@ -1684,7 +1684,7 @@ int pakfire_file_matches(struct pakfire_file* file, const char* pattern) {
        return pakfire_path_match(pattern, path);
 }
 
-static int pakfire_file_fconsume(struct pakfire_file* file, FILE* src) {
+static int pakfire_file_fconsume(pakfire_file* file, FILE* src) {
        FILE* dst = NULL;
        int fd = -EBADF;
        int r;
@@ -1721,7 +1721,7 @@ ERROR:
        return r;
 }
 
-int pakfire_file_consume(struct pakfire_file* file, int srcfd) {
+int pakfire_file_consume(pakfire_file* file, int srcfd) {
        ssize_t bytes_written = 0;
        struct stat st = {};
        int fd = -EBADF;
@@ -1760,7 +1760,7 @@ ERROR:
        return r;
 }
 
-int pakfire_file_fix_interpreter(struct pakfire_file* file) {
+int pakfire_file_fix_interpreter(pakfire_file* file) {
        const char* interpreter = NULL;
        char* buffer = NULL;
        FILE* f = NULL;

diff --git a/src/pakfire/file.h b/src/pakfire/file.h
index eaf826540c7ff104b8e13f15864317b1d92c4920..82a6a34fa4a51b8e0e54ad5db714289ec097efa2 100644 (file)
--- a/src/pakfire/file.h
+++ b/src/pakfire/file.h
@@ -30,7 +30,7 @@
 #include <archive.h>
 #include <archive_entry.h>
 
-struct pakfire_file;
+typedef struct pakfire_file pakfire_file;
 
 #include <pakfire/hashes.h>
 #include <pakfire/pakfire.h>
@@ -39,72 +39,72 @@ enum pakfire_file_flags {
        PAKFIRE_FILE_CONFIG               = (1 << 0),
 };
 
-int pakfire_file_create(struct pakfire_file** file, struct pakfire* pakfire, const char* path);
+int pakfire_file_create(pakfire_file** file, struct pakfire* pakfire, const char* path);
 
-struct pakfire_file* pakfire_file_ref(struct pakfire_file* file);
-struct pakfire_file* pakfire_file_unref(struct pakfire_file* file);
+pakfire_file* pakfire_file_ref(pakfire_file* file);
+pakfire_file* pakfire_file_unref(pakfire_file* file);
 
-int pakfire_file_has_flag(struct pakfire_file* file, int flag);
-int pakfire_file_set_flags(struct pakfire_file* file, int flag);
+int pakfire_file_has_flag(pakfire_file* file, int flag);
+int pakfire_file_set_flags(pakfire_file* file, int flag);
 
-int pakfire_file_cmp(struct pakfire_file* file1, struct pakfire_file* file2);
+int pakfire_file_cmp(pakfire_file* file1, pakfire_file* file2);
 
-const char* pakfire_file_get_path(struct pakfire_file* file);
-int pakfire_file_set_path(struct pakfire_file* file, const char* path);
+const char* pakfire_file_get_path(pakfire_file* file);
+int pakfire_file_set_path(pakfire_file* file, const char* path);
 
-const char* pakfire_file_get_hardlink(struct pakfire_file* file);
-void pakfire_file_set_hardlink(struct pakfire_file* file, const char* link);
-const char* pakfire_file_get_symlink(struct pakfire_file* file);
-void pakfire_file_set_symlink(struct pakfire_file* file, const char* link);
+const char* pakfire_file_get_hardlink(pakfire_file* file);
+void pakfire_file_set_hardlink(pakfire_file* file, const char* link);
+const char* pakfire_file_get_symlink(pakfire_file* file);
+void pakfire_file_set_symlink(pakfire_file* file, const char* link);
 
-nlink_t pakfire_file_get_nlink(struct pakfire_file* file);
-void pakfire_file_set_nlink(struct pakfire_file* file, const nlink_t nlink);
+nlink_t pakfire_file_get_nlink(pakfire_file* file);
+void pakfire_file_set_nlink(pakfire_file* file, const nlink_t nlink);
 
-ino_t pakfire_file_get_inode(struct pakfire_file* file);
-void pakfire_file_set_inode(struct pakfire_file* file, const ino_t ino);
+ino_t pakfire_file_get_inode(pakfire_file* file);
+void pakfire_file_set_inode(pakfire_file* file, const ino_t ino);
 
-dev_t pakfire_file_get_dev(struct pakfire_file* file);
-void pakfire_file_set_dev(struct pakfire_file* file, const dev_t dev);
+dev_t pakfire_file_get_dev(pakfire_file* file);
+void pakfire_file_set_dev(pakfire_file* file, const dev_t dev);
 
-int pakfire_file_get_type(struct pakfire_file* file);
+int pakfire_file_get_type(pakfire_file* file);
 
-ssize_t pakfire_file_get_size(struct pakfire_file* file);
-void pakfire_file_set_size(struct pakfire_file* file, ssize_t size);
+ssize_t pakfire_file_get_size(pakfire_file* file);
+void pakfire_file_set_size(pakfire_file* file, ssize_t size);
 
-const char* pakfire_file_get_uname(struct pakfire_file* file);
-int pakfire_file_set_uname(struct pakfire_file* file, const char* uname);
+const char* pakfire_file_get_uname(pakfire_file* file);
+int pakfire_file_set_uname(pakfire_file* file, const char* uname);
 
-const char* pakfire_file_get_gname(struct pakfire_file* file);
-int pakfire_file_set_gname(struct pakfire_file* file, const char* gname);
+const char* pakfire_file_get_gname(pakfire_file* file);
+int pakfire_file_set_gname(pakfire_file* file, const char* gname);
 
-mode_t pakfire_file_get_mode(struct pakfire_file* file);
-void pakfire_file_set_mode(struct pakfire_file* file, mode_t mode);
+mode_t pakfire_file_get_mode(pakfire_file* file);
+void pakfire_file_set_mode(pakfire_file* file, mode_t mode);
 
-mode_t pakfire_file_get_perms(struct pakfire_file* file);
-void pakfire_file_set_perms(struct pakfire_file* file, const mode_t perms);
+mode_t pakfire_file_get_perms(pakfire_file* file);
+void pakfire_file_set_perms(pakfire_file* file, const mode_t perms);
 
-time_t pakfire_file_get_ctime(struct pakfire_file* file);
-void pakfire_file_set_ctime(struct pakfire_file* file, time_t time);
-time_t pakfire_file_get_mtime(struct pakfire_file* file);
-void pakfire_file_set_mtime(struct pakfire_file* file, time_t time);
+time_t pakfire_file_get_ctime(pakfire_file* file);
+void pakfire_file_set_ctime(pakfire_file* file, time_t time);
+time_t pakfire_file_get_mtime(pakfire_file* file);
+void pakfire_file_set_mtime(pakfire_file* file, time_t time);
 
 // Checksums
-int pakfire_file_get_checksum(struct pakfire_file* file, const enum pakfire_hash_type type,
+int pakfire_file_get_checksum(pakfire_file* file, const enum pakfire_hash_type type,
        const unsigned char** checksum, size_t* checksum_length);
-int pakfire_file_set_checksum(struct pakfire_file* file, const enum pakfire_hash_type type,
+int pakfire_file_set_checksum(pakfire_file* file, const enum pakfire_hash_type type,
        const unsigned char* checksum, const size_t checksum_length);
 
 // Capabilities
-int pakfire_file_has_caps(struct pakfire_file* file);
-char* pakfire_file_get_caps(struct pakfire_file* file);
+int pakfire_file_has_caps(pakfire_file* file);
+char* pakfire_file_get_caps(pakfire_file* file);
 
 // MIME Type
-const char* pakfire_file_get_mimetype(struct pakfire_file* file);
-int pakfire_file_set_mimetype(struct pakfire_file* file, const char* mimetype);
+const char* pakfire_file_get_mimetype(pakfire_file* file);
+int pakfire_file_set_mimetype(pakfire_file* file, const char* mimetype);
 
-struct pakfire_file* pakfire_file_parse_from_file(const char* list, unsigned int format);
+pakfire_file* pakfire_file_parse_from_file(const char* list, unsigned int format);
 
-int pakfire_file_matches(struct pakfire_file* file, const char* pattern);
+int pakfire_file_matches(pakfire_file* file, const char* pattern);
 
 enum pakfire_file_classes {
        PAKFIRE_FILE_UNKNOWN         = 0,
@@ -126,15 +126,15 @@ enum pakfire_file_classes {
        PAKFIRE_FILE_PERL            = (1 << 10),
 };
 
-int pakfire_file_is_executable(struct pakfire_file* file);
+int pakfire_file_is_executable(pakfire_file* file);
 
-int pakfire_file_has_payload(struct pakfire_file* file);
+int pakfire_file_has_payload(pakfire_file* file);
 
-int pakfire_file_write_fcaps(struct pakfire_file* file, struct vfs_cap_data* cap_data);
+int pakfire_file_write_fcaps(pakfire_file* file, struct vfs_cap_data* cap_data);
 
-int pakfire_file_create_from_archive_entry(struct pakfire_file** file, struct pakfire* pakfire,
+int pakfire_file_create_from_archive_entry(pakfire_file** file, struct pakfire* pakfire,
        struct archive_entry* entry);
-struct archive_entry* pakfire_file_archive_entry(struct pakfire_file* file, const enum pakfire_hash_type hashes);
+struct archive_entry* pakfire_file_archive_entry(pakfire_file* file, const enum pakfire_hash_type hashes);
 
 enum pakfire_file_dump_flags {
        PAKFIRE_FILE_DUMP_MODE         = (1 << 0),
@@ -151,32 +151,32 @@ enum pakfire_file_dump_flags {
                PAKFIRE_FILE_DUMP_LINK_TARGETS,
 };
 
-char* pakfire_file_dump(struct pakfire_file* file, int flags);
+char* pakfire_file_dump(pakfire_file* file, int flags);
 
-const char* pakfire_file_get_abspath(struct pakfire_file* file);
+const char* pakfire_file_get_abspath(pakfire_file* file);
 
-int pakfire_file_open(struct pakfire_file* file, int flags);
-FILE* pakfire_file_fopen(struct pakfire_file* file, const char* mode);
+int pakfire_file_open(pakfire_file* file, int flags);
+FILE* pakfire_file_fopen(pakfire_file* file, const char* mode);
 
-int pakfire_file_contains(struct pakfire_file* file, const char* needle, ssize_t length);
+int pakfire_file_contains(pakfire_file* file, const char* needle, ssize_t length);
 
 enum pakfire_file_cleanup_flags {
        PAKFIRE_FILE_CLEANUP_TIDY = (1 << 0),
 };
-int pakfire_file_cleanup(struct pakfire_file* file, int flags);
+int pakfire_file_cleanup(pakfire_file* file, int flags);
 
-int pakfire_file_symlink_target_exists(struct pakfire_file* file);
+int pakfire_file_symlink_target_exists(pakfire_file* file);
 
 // MIME Type
-int pakfire_file_detect_mimetype(struct pakfire_file* file);
+int pakfire_file_detect_mimetype(pakfire_file* file);
 
-int pakfire_file_classify(struct pakfire_file* file);
-int pakfire_file_matches_class(struct pakfire_file* file, const int class);
+int pakfire_file_classify(pakfire_file* file);
+int pakfire_file_matches_class(pakfire_file* file, const int class);
 
-int pakfire_file_verify(struct pakfire_file* file, int* status);
+int pakfire_file_verify(pakfire_file* file, int* status);
 
-int pakfire_file_consume(struct pakfire_file* file, int srcfd);
+int pakfire_file_consume(pakfire_file* file, int srcfd);
 
-int pakfire_file_fix_interpreter(struct pakfire_file* file);
+int pakfire_file_fix_interpreter(pakfire_file* file);
 
 #endif /* PAKFIRE_FILE_H */

diff --git a/src/pakfire/filelist.c b/src/pakfire/filelist.c
index 44f707d9e974ecde8fffef461e1da69d67849d06..fb8953cfd2eb73d2a0953f4d511c916db29fd0f6 100644 (file)
--- a/src/pakfire/filelist.c
+++ b/src/pakfire/filelist.c
@@ -40,7 +40,7 @@ struct pakfire_filelist {
        struct pakfire* pakfire;
        int nrefs;
 
-       struct pakfire_file** files;
+       pakfire_file** files;
        unsigned int num_files;
 };
 
@@ -121,7 +121,7 @@ void pakfire_filelist_clear(pakfire_filelist* list) {
        }
 }
 
-struct pakfire_file* pakfire_filelist_get(pakfire_filelist* list, size_t index) {
+pakfire_file* pakfire_filelist_get(pakfire_filelist* list, size_t index) {
        // Check that index is in range
        if (index >= list->num_files) {
                errno = ERANGE;
@@ -134,7 +134,7 @@ struct pakfire_file* pakfire_filelist_get(pakfire_filelist* list, size_t index)
 /*
        Checks if the file is already on the list
 */
-static int pakfire_filelist_has_file(pakfire_filelist* list, struct pakfire_file* file) {
+static int pakfire_filelist_has_file(pakfire_filelist* list, pakfire_file* file) {
        for (unsigned int i = 0; i < list->num_files; i++) {
                if (list->files[i] == file)
                        return i;
@@ -144,7 +144,7 @@ static int pakfire_filelist_has_file(pakfire_filelist* list, struct pakfire_file
        return -1;
 }
 
-static int pakfire_filelist_search(pakfire_filelist* list, struct pakfire_file* file) {
+static int pakfire_filelist_search(pakfire_filelist* list, pakfire_file* file) {
        int i;
        int r;
 
@@ -171,7 +171,7 @@ static int pakfire_filelist_search(pakfire_filelist* list, struct pakfire_file*
        return lo;
 }
 
-int pakfire_filelist_add(pakfire_filelist* list, struct pakfire_file* file) {
+int pakfire_filelist_add(pakfire_filelist* list, pakfire_file* file) {
        // Do not do anything if the file is already on the list
        if (pakfire_filelist_has_file(list, file) >= 0)
                return 0;
@@ -199,7 +199,7 @@ int pakfire_filelist_add(pakfire_filelist* list, struct pakfire_file* file) {
        return 0;
 }
 
-static int pakfire_filelist_remove(pakfire_filelist* list, struct pakfire_file* file) {
+static int pakfire_filelist_remove(pakfire_filelist* list, pakfire_file* file) {
        // Check if the file is on the list
        int pos = pakfire_filelist_has_file(list, file);
 
@@ -228,7 +228,7 @@ static int pakfire_filelist_remove(pakfire_filelist* list, struct pakfire_file*
 }
 
 static int __pakfire_filelist_remove_one(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        pakfire_filelist* list = data;
 
        // Remove the file from the given filelist
@@ -326,7 +326,7 @@ static int pakfire_filelist_scan_filter(struct archive* archive, void* p,
 int pakfire_filelist_scan(pakfire_filelist* list, const char* root,
                const char** includes, const char** excludes, int flags) {
        struct archive* reader = NULL;
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        struct archive_entry* entry = NULL;
        pakfire_filelist_matches matches = {
                .root     = root,
@@ -553,7 +553,7 @@ ERROR:
 }
 
 static int __pakfire_filelist_dump(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        int* flags = data;
 
        char* s = pakfire_file_dump(file, *flags);
@@ -648,7 +648,7 @@ int pakfire_filelist_cleanup(pakfire_filelist* list, int flags) {
 }
 
 static int __pakfire_filelist_matches_class(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        int* class = data;
 
        return pakfire_file_matches_class(file, *class);

diff --git a/src/pakfire/filelist.h b/src/pakfire/filelist.h
index 61f6b3df0d4e2df7d7d36ba2309052760ebbc5f7..ca090868add019d564988bfb956495995432d4be 100644 (file)
--- a/src/pakfire/filelist.h
+++ b/src/pakfire/filelist.h
@@ -38,9 +38,9 @@ size_t pakfire_filelist_length(pakfire_filelist* list);
 int pakfire_filelist_is_empty(pakfire_filelist* list);
 void pakfire_filelist_clear(pakfire_filelist* list);
 
-struct pakfire_file* pakfire_filelist_get(pakfire_filelist* list, size_t index);
+pakfire_file* pakfire_filelist_get(pakfire_filelist* list, size_t index);
 
-int pakfire_filelist_add(pakfire_filelist* list, struct pakfire_file* file);
+int pakfire_filelist_add(pakfire_filelist* list, pakfire_file* file);
 
 size_t pakfire_filelist_total_size(pakfire_filelist* list);
 
@@ -58,7 +58,7 @@ int pakfire_filelist_scan(pakfire_filelist* list, const char* root,
 int pakfire_filelist_contains(pakfire_filelist* list, const char* pattern);
 
 typedef int (*pakfire_filelist_walk_callback)
-       (pakfire_ctx* ctx, struct pakfire_file* file, void* data);
+       (pakfire_ctx* ctx, pakfire_file* file, void* data);
 
 enum pakfire_filelist_walk_flags {
        PAKFIRE_FILELIST_SHOW_PROGRESS = (1 << 0),

diff --git a/src/pakfire/jail.c b/src/pakfire/jail.c
index cb820b1e5518a250b8dae0194ee91f61ae41a222..8330190eb6e3e06a936b13fab2ace7580456e14d 100644 (file)
--- a/src/pakfire/jail.c
+++ b/src/pakfire/jail.c
@@ -2329,7 +2329,7 @@ ssize_t pakfire_jail_send_buffer(pakfire_ctx* ctx,
 ssize_t pakfire_jail_send_filelist(pakfire_ctx* ctx,
                void* data, char* buffer, size_t length) {
        struct pakfire_jail_filelist* input = data;
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        int r;
 
        // If there is any path data left, we send that first

diff --git a/src/pakfire/linter-file.c b/src/pakfire/linter-file.c
index ba83111a69d440ff5573276d01b18a128d5dc645..26b34eafc8d7ba3471e7c83e14452c5068b5dedc 100644 (file)
--- a/src/pakfire/linter-file.c
+++ b/src/pakfire/linter-file.c
@@ -41,7 +41,7 @@ struct pakfire_linter_file {
        struct pakfire_linter* linter;
 
        // File
-       struct pakfire_file* file;
+       pakfire_file* file;
 
        // ELF Object
        pakfire_elf* elf;
@@ -108,7 +108,7 @@ static void pakfire_linter_file_free(struct pakfire_linter_file* lfile) {
 }
 
 int pakfire_linter_file_create(struct pakfire_linter_file** lfile,
-               pakfire_ctx* ctx, struct pakfire_linter* linter, struct pakfire_file* file, int fd) {
+               pakfire_ctx* ctx, struct pakfire_linter* linter, pakfire_file* file, int fd) {
        struct pakfire_linter_file* l = NULL;
        int r = 0;
 

diff --git a/src/pakfire/linter-file.h b/src/pakfire/linter-file.h
index f899eb92c2c6b9a4e4ba4678ee74023aca46e43f..73a85776aa5d540d571c58290f103d5a6796897f 100644 (file)
--- a/src/pakfire/linter-file.h
+++ b/src/pakfire/linter-file.h
@@ -28,7 +28,7 @@ struct pakfire_linter_file;
 #include <pakfire/linter.h>
 
 int pakfire_linter_file_create(struct pakfire_linter_file** lfile,
-       pakfire_ctx* ctx, struct pakfire_linter* linter, struct pakfire_file* file, int fd);
+       pakfire_ctx* ctx, struct pakfire_linter* linter, pakfire_file* file, int fd);
 
 struct pakfire_linter_file* pakfire_linter_file_ref(struct pakfire_linter_file* lfile);
 struct pakfire_linter_file* pakfire_linter_file_unref(struct pakfire_linter_file* lfile);

diff --git a/src/pakfire/linter.c b/src/pakfire/linter.c
index 3172a59b74c818d5305ce554d1ad20ba70a6e7e5..27caad8392af8d71f4092249a7766fe18a12294b 100644 (file)
--- a/src/pakfire/linter.c
+++ b/src/pakfire/linter.c
@@ -43,7 +43,7 @@ struct pakfire_linter_result {
        TAILQ_ENTRY(pakfire_linter_result) nodes;
 
        // File
-       struct pakfire_file* file;
+       pakfire_file* file;
 
        // Priority
        int priority;
@@ -93,7 +93,7 @@ static void pakfire_linter_result_free(struct pakfire_linter_result* result) {
        free(result);
 }
 
-int pakfire_linter_result(struct pakfire_linter* linter, struct pakfire_file* file,
+int pakfire_linter_result(struct pakfire_linter* linter, pakfire_file* file,
                int priority, const char* format, ...) {
        struct pakfire_linter_result* result = NULL;
        va_list args;
@@ -263,7 +263,7 @@ void pakfire_linter_set_result_callback(struct pakfire_linter* linter,
 }
 
 static int pakfire_linter_read_file(
-               struct pakfire_linter* linter, struct pakfire_file* file, struct archive* a) {
+               struct pakfire_linter* linter, pakfire_file* file, struct archive* a) {
        int fd = -EBADF;
        int r;
 
@@ -347,7 +347,7 @@ ERROR:
 }
 
 static int pakfire_linter_payload(
-               struct pakfire_linter* linter, struct pakfire_file* file, struct archive* a) {
+               struct pakfire_linter* linter, pakfire_file* file, struct archive* a) {
        struct pakfire_linter_file* lfile = NULL;
        int fd = -EBADF;
        int r;
@@ -423,12 +423,12 @@ static int pakfire_linter_name(struct pakfire_linter* linter) {
 }
 
 static int pakfire_linter_lint_source(
-               struct pakfire_linter* linter, struct pakfire_file* file) {
+               struct pakfire_linter* linter, pakfire_file* file) {
        return 0;
 }
 
 static int pakfire_linter_lint_fhs(
-               struct pakfire_linter* linter, struct pakfire_file* file) {
+               struct pakfire_linter* linter, pakfire_file* file) {
        int r;
 
        // Checking against FHS
@@ -481,7 +481,7 @@ static int pakfire_linter_lint_fhs(
 static int pakfire_linter_file(pakfire_archive* archive,
                struct archive* a, struct archive_entry* e, void* data) {
        struct pakfire_linter* linter = data;
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        int r;
 
        // Fetch a file object
@@ -520,7 +520,7 @@ ERROR:
 }
 
 static int pakfire_linter_dump_results(
-               struct pakfire_linter* linter, struct pakfire_file* file, const char* prefix) {
+               struct pakfire_linter* linter, pakfire_file* file, const char* prefix) {
        struct pakfire_linter_result* result = NULL;
 
        TAILQ_FOREACH(result, &linter->results, nodes) {
@@ -546,7 +546,7 @@ static int pakfire_linter_dump_results(
 }
 
 static int __pakfire_linter_dump_file(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct pakfire_linter* linter = data;
 
        // Show information about the file

diff --git a/src/pakfire/linter.h b/src/pakfire/linter.h
index c01468b116bc6072d36c4657c1de9b593973b93a..33e392349c243581b51fbcb132c533640f1be671 100644 (file)
--- a/src/pakfire/linter.h
+++ b/src/pakfire/linter.h
@@ -34,7 +34,7 @@ enum pakfire_linter_priority {
 
 typedef int (*pakfire_linter_result_callback)(pakfire_ctx* ctx,
        pakfire_archive* archive, struct pakfire_package* package,
-       struct pakfire_file* file, int priority, const char* message, void* data);
+       pakfire_file* file, int priority, const char* message, void* data);
 
 struct pakfire_linter;
 
@@ -49,7 +49,7 @@ void pakfire_linter_set_result_callback(struct pakfire_linter* linter,
 
 int pakfire_linter_lint(struct pakfire_linter* linter);
 
-int pakfire_linter_result(struct pakfire_linter* linter, struct pakfire_file* file,
+int pakfire_linter_result(struct pakfire_linter* linter, pakfire_file* file,
        int priority, const char* format, ...) __attribute__((format(printf, 4, 5)));
 
 #define pakfire_linter_info(linter, format, ...) \

diff --git a/src/pakfire/package.c b/src/pakfire/package.c
index f1482e0f422b28be9af426c7cc73d7d81dab690d..12637eee9d8c7e40ae802ccfcfcc5f3306f39d82 100644 (file)
--- a/src/pakfire/package.c
+++ b/src/pakfire/package.c
@@ -2120,7 +2120,7 @@ char* pakfire_package_dump(struct pakfire_package* pkg, int flags) {
                const char* prefix = _("Filelist");
 
                for (unsigned int i = 0; i < pakfire_filelist_length(filelist); i++) {
-                       struct pakfire_file* file = pakfire_filelist_get(filelist, i);
+                       pakfire_file* file = pakfire_filelist_get(filelist, i);
 
                        const char* path = pakfire_file_get_path(file);
                        pakfire_package_dump_add_line(&string, prefix, path);
@@ -2173,7 +2173,7 @@ static int __pakfire_package_fetch_filelist(void* data, Solvable* s, Repodata* r
                Repokey* key, struct s_KeyValue* kv) {
        struct pakfire_package_filelist_search* search = (struct pakfire_package_filelist_search*)data;
 
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        int r;
 
        // Skip any results of the wrong type
@@ -2296,7 +2296,7 @@ int pakfire_package_append_file(struct pakfire_package* pkg, const char* path) {
 }
 
 static int __pakfire_package_set_filelist(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct pakfire_package* pkg = data;
 
        // Fetch the path
@@ -2436,7 +2436,7 @@ ERROR:
 }
 
 static int __pakfire_package_add_json_filelist(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct json_object* filelist = data;
        int r;
 

diff --git a/src/pakfire/packager.c b/src/pakfire/packager.c
index baa24311c634e096133c6d4ec55edfbdf565f0c8..4035d948c0963674908d78ecb33ba338334d65bf 100644 (file)
--- a/src/pakfire/packager.c
+++ b/src/pakfire/packager.c
@@ -425,7 +425,7 @@ ERROR:
        return r;
 }
 
-int pakfire_packager_add_file(struct pakfire_packager* packager, struct pakfire_file* file) {
+int pakfire_packager_add_file(struct pakfire_packager* packager, pakfire_file* file) {
        int r;
 
        // Check input
@@ -490,7 +490,7 @@ int pakfire_packager_add_file(struct pakfire_packager* packager, struct pakfire_
 int pakfire_packager_add(struct pakfire_packager* packager,
                const char* sourcepath, const char* path) {
        struct archive_entry* entry = NULL;
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        int r;
 
        // Check inputs
@@ -537,7 +537,7 @@ ERROR:
 }
 
 static int __pakfire_packager_add_files(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct pakfire_packager* packager = data;
 
        return pakfire_packager_add_file(packager, file);

diff --git a/src/pakfire/packager.h b/src/pakfire/packager.h
index aad38dec7fce4f1b1b50f7862a19bcaf1ce7ee10..965d11a15174b567cacad80c2882cf4ddc319600 100644 (file)
--- a/src/pakfire/packager.h
+++ b/src/pakfire/packager.h
@@ -43,7 +43,7 @@ int pakfire_packager_write_archive(struct pakfire_packager* self,
 int pakfire_packager_finish(struct pakfire_packager* packager, FILE* f);
 
 int pakfire_packager_add_file(
-       struct pakfire_packager* packager, struct pakfire_file* file);
+       struct pakfire_packager* packager, pakfire_file* file);
 int pakfire_packager_add_files(struct pakfire_packager* packager,
        pakfire_filelist* filelist);
 int pakfire_packager_add(struct pakfire_packager* packager,

diff --git a/src/pakfire/stripper.c b/src/pakfire/stripper.c
index c916da8c4a5923072fa03188efb304f6d23ce3a7..2a55fa815a5d6cdc4397d4ef39d8a1cd73c8e590 100644 (file)
--- a/src/pakfire/stripper.c
+++ b/src/pakfire/stripper.c
@@ -162,7 +162,7 @@ struct pakfire_stripper* pakfire_stripper_unref(struct pakfire_stripper* self) {
 }
 
 static int pakfire_stripper_find_elf(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct pakfire_stripper* self = data;
        int r;
 
@@ -212,7 +212,7 @@ ERROR:
 static int pakfire_stripper_collect_sources(
                pakfire_ctx* ctx, pakfire_elf* elf, const char* filename, void* data) {
        struct pakfire_stripper* self = data;
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        int r;
 
        // If the source file is not in the right path, we ignore it
@@ -241,7 +241,7 @@ ERROR:
 }
 
 static int pakfire_stripper_copy_sources(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct pakfire_stripper* self = data;
        struct stat st = {};
        char p[PATH_MAX];
@@ -333,7 +333,7 @@ ERROR:
        __pakfire_stripper_debug_path(stripper, s, sizeof(s), filename, build_id)
 
 static int __pakfire_stripper_debug_path(struct pakfire_stripper* self,
-               char* buffer, size_t length, struct pakfire_file* file, const char* build_id) {
+               char* buffer, size_t length, pakfire_file* file, const char* build_id) {
        char debugpath[PATH_MAX];
        int r;
 
@@ -357,7 +357,7 @@ static int __pakfire_stripper_debug_path(struct pakfire_stripper* self,
 }
 
 static int pakfire_stripper_extract_debuginfo(struct pakfire_stripper* self,
-               struct pakfire_file* file, pakfire_elf* elf, const char* build_id_path) {
+               pakfire_file* file, pakfire_elf* elf, const char* build_id_path) {
        int r;
 
        const char* path =  pakfire_file_get_abspath(file);
@@ -400,7 +400,7 @@ static int pakfire_stripper_extract_debuginfo(struct pakfire_stripper* self,
 }
 
 static int pakfire_stripper_strip_debuginfo(struct pakfire_stripper* self,
-               struct pakfire_file* file, pakfire_elf* elf) {
+               pakfire_file* file, pakfire_elf* elf) {
        char debugpath[PATH_MAX];
        char tmppath[PATH_MAX] = "";
        char** argv = NULL;
@@ -520,7 +520,7 @@ ERROR:
 }
 
 static int pakfire_stripper_strip(
-               pakfire_ctx* ctx, struct pakfire_file* file, void* data) {
+               pakfire_ctx* ctx, pakfire_file* file, void* data) {
        struct pakfire_stripper* self = data;
        pakfire_elf* elf = NULL;
        int r;

diff --git a/src/python/file.c b/src/python/file.c
index ce36628244f59e4fd2faa29cedf1412cd8d52348..131df7667f3cd62805386422b784f9d8e2ff8fb9 100644 (file)
--- a/src/python/file.c
+++ b/src/python/file.c
@@ -28,7 +28,7 @@
 #include "pakfire.h"
 #include "util.h"
 
-PyObject* new_file(PyTypeObject* type, struct pakfire_file* file) {
+PyObject* new_file(PyTypeObject* type, pakfire_file* file) {
        FileObject* self = (FileObject *)type->tp_alloc(type, 0);
        if (self) {
                self->file = pakfire_file_ref(file);

diff --git a/src/python/file.h b/src/python/file.h
index 0494b688520bd388369bc6de4607ff6f619f6a1c..8b696937fcf4d8b38b97bbca9198232314658a25 100644 (file)
--- a/src/python/file.h
+++ b/src/python/file.h
@@ -27,11 +27,11 @@
 
 typedef struct {
        PyObject_HEAD
-       struct pakfire_file* file;
+       pakfire_file* file;
 } FileObject;
 
 extern PyTypeObject FileType;
 
-PyObject* new_file(PyTypeObject* type, struct pakfire_file* file);
+PyObject* new_file(PyTypeObject* type, pakfire_file* file);
 
 #endif /* PYTHON_PAKFIRE_FILE_H */

diff --git a/src/python/package.c b/src/python/package.c
index b684c6d8b8148815dc0ec8f043d85c96270b4206..a238ee98ade460dc8e44bd649912bca06de09fb5 100644 (file)
--- a/src/python/package.c
+++ b/src/python/package.c
@@ -427,7 +427,7 @@ static PyObject* Package_get_filelist(PackageObject* self, PyObject* args) {
 
        pakfire_filelist* filelist = pakfire_package_get_filelist(self->package);
        for (unsigned int i = 0; i < pakfire_filelist_length(filelist); i++) {
-               struct pakfire_file* file = pakfire_filelist_get(filelist, i);
+               pakfire_file* file = pakfire_filelist_get(filelist, i);
                const char* path = pakfire_file_get_path(file);
                pakfire_file_unref(file);
 

diff --git a/src/python/util.c b/src/python/util.c
index 1ff6eed5af66ec1b7b10861933e74cfd74ec60ea..1dc0ffc663dbc86002664548f6249f000f96987c 100644 (file)
--- a/src/python/util.c
+++ b/src/python/util.c
@@ -95,7 +95,7 @@ ERROR:
 }
 
 PyObject* PyList_FromFileList(pakfire_filelist* filelist) {
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        PyObject* f = NULL;
        int r;
 

diff --git a/tests/libpakfire/file.c b/tests/libpakfire/file.c
index b11a155c5ce439d7e1a1f9baab744ce3c98c438b..61efe4364875147aeb7ae8ce94a6f24f7de627fc 100644 (file)
--- a/tests/libpakfire/file.c
+++ b/tests/libpakfire/file.c
@@ -24,7 +24,7 @@
 #include "../testsuite.h"
 
 static int test_create(const struct test* t) {
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
 
        // Create a new file
        ASSERT_SUCCESS(pakfire_file_create(&file, t->pakfire, NULL));
@@ -43,7 +43,7 @@ FAIL:
 }
 
 static int test_create_invalid(const struct test* t) {
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
 
        // Create a new file
        ASSERT_SUCCESS(pakfire_file_create(&file, t->pakfire, NULL));
@@ -62,9 +62,9 @@ FAIL:
 
 static int test_create_filelist(const struct test* t) {
        pakfire_filelist* list = NULL;
-       struct pakfire_file* file1 = NULL;
-       struct pakfire_file* file2 = NULL;
-       struct pakfire_file* file3 = NULL;
+       pakfire_file* file1 = NULL;
+       pakfire_file* file2 = NULL;
+       pakfire_file* file3 = NULL;
        int r = EXIT_FAILURE;
 
        // Create a new filelist

diff --git a/tests/libpakfire/package.c b/tests/libpakfire/package.c
index 456836e5e924d1651e5ddb6defa0ff5fad748142..626ee66392d7a4344a1bdd44dd6fcac65e86995e 100644 (file)
--- a/tests/libpakfire/package.c
+++ b/tests/libpakfire/package.c
@@ -251,7 +251,7 @@ FAIL:
 
 static int test_filelist(const struct test* t) {
        pakfire_filelist* filelist = NULL;
-       struct pakfire_file* file = NULL;
+       pakfire_file* file = NULL;
        struct pakfire_package* pkg = NULL;
        int r = EXIT_FAILURE;