From: Michael Tremer Date: Thu, 3 Jun 2021 19:34:34 +0000 (+0000) Subject: libpakfire: Change PakfireFile to struct pakfire_file X-Git-Tag: 0.9.28~1285^2~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5803b5f69752ae4291ff122c5d2ab821325e3c69;p=pakfire.git libpakfire: Change PakfireFile to struct pakfire_file Signed-off-by: Michael Tremer --- diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c index 3773a5cf0..adb4746c0 100644 --- a/src/_pakfire/package.c +++ b/src/_pakfire/package.c @@ -514,7 +514,7 @@ static PyObject* Package_get_filelist(PackageObject* self, PyObject* args) { PakfireFilelist filelist = pakfire_package_get_filelist(self->package); for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) { - PakfireFile file = pakfire_filelist_get(filelist, i); + struct pakfire_file* file = pakfire_filelist_get(filelist, i); const char* path = pakfire_file_get_path(file); pakfire_file_unref(file); @@ -573,7 +573,7 @@ static int Package_set_filelist(PackageObject* self, PyObject* value) { Py_DECREF(item); // Create a new file - PakfireFile file; + struct pakfire_file* file; r = pakfire_file_create(&file, pakfire); if (r) { diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index c0777e300..3e1d18c58 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -1073,7 +1073,7 @@ static int pakfire_archive_load_filelist_mtree(PakfireArchive archive) { goto ERROR; for (;;) { - PakfireFile file; + struct pakfire_file* file; r = archive_read_next_header(mtree, &entry); if (r == ARCHIVE_EOF) { diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index c2ba2b325..f09df6dd2 100644 --- a/src/libpakfire/build.c +++ b/src/libpakfire/build.c @@ -271,7 +271,7 @@ static int pakfire_build_package_add_files(Pakfire pakfire, PakfireParser makefi // Add all files to the package for (unsigned int i = 0; i < length; i++) { - PakfireFile file = pakfire_filelist_get(filelist, i); + struct pakfire_file* file = pakfire_filelist_get(filelist, i); // Add the file to the package r = pakfire_packager_add( diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c index 67536842e..ddb702d9c 100644 --- a/src/libpakfire/db.c +++ b/src/libpakfire/db.c @@ -764,7 +764,7 @@ static int pakfire_db_add_files(struct pakfire_db* db, unsigned long id, Pakfire } for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) { - PakfireFile file = pakfire_filelist_get(filelist, i); + struct pakfire_file* file = pakfire_filelist_get(filelist, i); // Bind package ID r = sqlite3_bind_int64(stmt, 1, id); diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c index 4dbc316ea..0d038d05e 100644 --- a/src/libpakfire/file.c +++ b/src/libpakfire/file.c @@ -35,7 +35,7 @@ #include #include -struct _PakfireFile { +struct pakfire_file { Pakfire pakfire; int nrefs; @@ -59,8 +59,8 @@ struct _PakfireFile { //int is_datafile; }; -PAKFIRE_EXPORT int pakfire_file_create(PakfireFile* file, Pakfire pakfire) { - PakfireFile f = calloc(1, sizeof(*f)); +PAKFIRE_EXPORT int pakfire_file_create(struct pakfire_file** file, Pakfire pakfire) { + struct pakfire_file* f = calloc(1, sizeof(*f)); if (!f) return -ENOMEM; @@ -71,7 +71,7 @@ PAKFIRE_EXPORT int pakfire_file_create(PakfireFile* file, Pakfire pakfire) { return 0; } -int pakfire_file_create_from_archive_entry(PakfireFile* file, Pakfire pakfire, +int pakfire_file_create_from_archive_entry(struct pakfire_file** file, Pakfire pakfire, struct archive_entry* entry) { int r = pakfire_file_create(file, pakfire); if (r) @@ -91,7 +91,7 @@ ERROR: return r; } -struct archive_entry* pakfire_file_archive_entry(PakfireFile file) { +struct archive_entry* pakfire_file_archive_entry(struct pakfire_file* file) { struct archive_entry* entry = archive_entry_new(); if (!entry) return NULL; @@ -121,7 +121,7 @@ struct archive_entry* pakfire_file_archive_entry(PakfireFile file) { return entry; } -int pakfire_file_copy_archive_entry(PakfireFile file, struct archive_entry* entry) { +int pakfire_file_copy_archive_entry(struct pakfire_file* file, struct archive_entry* entry) { // Set abspath pakfire_file_set_abspath(file, archive_entry_sourcepath(entry)); @@ -147,7 +147,7 @@ int pakfire_file_copy_archive_entry(PakfireFile file, struct archive_entry* entr return 0; } -static void pakfire_file_free(PakfireFile file) { +static void pakfire_file_free(struct pakfire_file* file) { pakfire_unref(file->pakfire); if (file->chksum) @@ -156,13 +156,13 @@ static void pakfire_file_free(PakfireFile file) { free(file); } -PAKFIRE_EXPORT PakfireFile pakfire_file_ref(PakfireFile file) { +PAKFIRE_EXPORT struct pakfire_file* pakfire_file_ref(struct pakfire_file* file) { file->nrefs++; return file; } -PAKFIRE_EXPORT PakfireFile pakfire_file_unref(PakfireFile file) { +PAKFIRE_EXPORT struct pakfire_file* pakfire_file_unref(struct pakfire_file* file) { if (--file->nrefs > 0) return file; @@ -170,86 +170,86 @@ PAKFIRE_EXPORT PakfireFile pakfire_file_unref(PakfireFile file) { return NULL; } -PAKFIRE_EXPORT int pakfire_file_cmp(PakfireFile file1, PakfireFile file2) { +PAKFIRE_EXPORT int pakfire_file_cmp(struct pakfire_file* file1, struct 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(PakfireFile file) { +const char* pakfire_file_get_abspath(struct pakfire_file* file) { return file->abspath; } -int pakfire_file_set_abspath(PakfireFile file, const char* path) { +int pakfire_file_set_abspath(struct pakfire_file* file, const char* path) { return pakfire_string_set(file->abspath, path); } -PAKFIRE_EXPORT const char* pakfire_file_get_path(PakfireFile file) { +PAKFIRE_EXPORT const char* pakfire_file_get_path(struct pakfire_file* file) { return file->path; } -PAKFIRE_EXPORT int pakfire_file_set_path(PakfireFile file, const char* path) { +PAKFIRE_EXPORT int pakfire_file_set_path(struct pakfire_file* file, const char* path) { return pakfire_string_set(file->path, path); } -PAKFIRE_EXPORT int pakfire_file_get_type(PakfireFile file) { +PAKFIRE_EXPORT int pakfire_file_get_type(struct pakfire_file* file) { return file->mode & S_IFMT; } -PAKFIRE_EXPORT ssize_t pakfire_file_get_size(PakfireFile file) { +PAKFIRE_EXPORT ssize_t pakfire_file_get_size(struct pakfire_file* file) { return file->size; } -PAKFIRE_EXPORT void pakfire_file_set_size(PakfireFile file, ssize_t size) { +PAKFIRE_EXPORT void pakfire_file_set_size(struct pakfire_file* file, ssize_t size) { file->size = size; } -PAKFIRE_EXPORT const char* pakfire_file_get_user(PakfireFile file) { +PAKFIRE_EXPORT const char* pakfire_file_get_user(struct pakfire_file* file) { return file->user; } -PAKFIRE_EXPORT void pakfire_file_set_user(PakfireFile file, const char* user) { +PAKFIRE_EXPORT void pakfire_file_set_user(struct pakfire_file* file, const char* user) { pakfire_string_set(file->user, user); } -PAKFIRE_EXPORT const char* pakfire_file_get_group(PakfireFile file) { +PAKFIRE_EXPORT const char* pakfire_file_get_group(struct pakfire_file* file) { return file->group; } -PAKFIRE_EXPORT void pakfire_file_set_group(PakfireFile file, const char* group) { +PAKFIRE_EXPORT void pakfire_file_set_group(struct pakfire_file* file, const char* group) { pakfire_string_set(file->group, group); } -PAKFIRE_EXPORT mode_t pakfire_file_get_mode(PakfireFile file) { +PAKFIRE_EXPORT mode_t pakfire_file_get_mode(struct pakfire_file* file) { return file->mode; } -PAKFIRE_EXPORT void pakfire_file_set_mode(PakfireFile file, mode_t mode) { +PAKFIRE_EXPORT void pakfire_file_set_mode(struct pakfire_file* file, mode_t mode) { file->mode = mode; } -PAKFIRE_EXPORT time_t pakfire_file_get_ctime(PakfireFile file) { +PAKFIRE_EXPORT time_t pakfire_file_get_ctime(struct pakfire_file* file) { return file->ctime; } -PAKFIRE_EXPORT void pakfire_file_set_ctime(PakfireFile file, time_t time) { +PAKFIRE_EXPORT void pakfire_file_set_ctime(struct pakfire_file* file, time_t time) { file->ctime = time; } -PAKFIRE_EXPORT time_t pakfire_file_get_mtime(PakfireFile file) { +PAKFIRE_EXPORT time_t pakfire_file_get_mtime(struct pakfire_file* file) { return file->mtime; } -PAKFIRE_EXPORT void pakfire_file_set_mtime(PakfireFile file, time_t time) { +PAKFIRE_EXPORT void pakfire_file_set_mtime(struct pakfire_file* file, time_t time) { file->mtime = time; } -PAKFIRE_EXPORT const char* pakfire_file_get_chksum(PakfireFile file) { +PAKFIRE_EXPORT const char* pakfire_file_get_chksum(struct pakfire_file* file) { return file->chksum; } -PAKFIRE_EXPORT void pakfire_file_set_chksum(PakfireFile file, const char* chksum) { +PAKFIRE_EXPORT void pakfire_file_set_chksum(struct pakfire_file* file, const char* chksum) { if (file->chksum) { free(file->chksum); file->chksum = NULL; @@ -259,7 +259,7 @@ PAKFIRE_EXPORT void pakfire_file_set_chksum(PakfireFile file, const char* chksum file->chksum = strdup(chksum); } -static int pakfire_file_levels(PakfireFile file) { +static int pakfire_file_levels(struct pakfire_file* file) { if (!*file->path) return 0; @@ -279,7 +279,7 @@ static int pakfire_file_levels(PakfireFile file) { 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(PakfireFile file) { +int pakfire_file_cleanup(struct pakfire_file* file) { char path[PATH_MAX]; if (!*file->abspath) { diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c index 3e9507ce8..713418167 100644 --- a/src/libpakfire/filelist.c +++ b/src/libpakfire/filelist.c @@ -37,14 +37,14 @@ struct _PakfireFilelist { Pakfire pakfire; int nrefs; - PakfireFile* elements; + struct pakfire_file** elements; size_t elements_size; size_t size; }; static int pakfire_filelist_grow(PakfireFilelist list, size_t size) { - PakfireFile* elements = reallocarray(list->elements, + struct pakfire_file** elements = reallocarray(list->elements, list->elements_size + size, sizeof(*list->elements)); if (!elements) return -errno; @@ -109,14 +109,14 @@ PAKFIRE_EXPORT void pakfire_filelist_clear(PakfireFilelist list) { list->size = 0; } -PAKFIRE_EXPORT PakfireFile pakfire_filelist_get(PakfireFilelist list, size_t index) { +PAKFIRE_EXPORT struct pakfire_file* pakfire_filelist_get(PakfireFilelist list, size_t index) { if (index >= list->size) return NULL; return pakfire_file_ref(list->elements[index]); } -PAKFIRE_EXPORT int pakfire_filelist_append(PakfireFilelist list, PakfireFile file) { +PAKFIRE_EXPORT int pakfire_filelist_append(PakfireFilelist list, struct pakfire_file* file) { if (!file) return EINVAL; @@ -133,8 +133,8 @@ PAKFIRE_EXPORT int pakfire_filelist_append(PakfireFilelist list, PakfireFile fil } static int __sort(const void* ptr1, const void* ptr2) { - PakfireFile file1 = (PakfireFile)ptr1; - PakfireFile file2 = (PakfireFile)ptr2; + struct pakfire_file* file1 = (struct pakfire_file*)ptr1; + struct pakfire_file* file2 = (struct pakfire_file*)ptr2; return pakfire_file_cmp(file1, file2); } @@ -147,7 +147,7 @@ PAKFIRE_EXPORT void pakfire_filelist_sort(PakfireFilelist list) { qsort(list->elements, list->size, sizeof(*list->elements), __sort); } -static int pakfire_filelist_parse_line(PakfireFile* file, Pakfire pakfire, +static int pakfire_filelist_parse_line(struct pakfire_file** file, Pakfire pakfire, char* line, unsigned int format) { unsigned int i = 0; @@ -274,7 +274,7 @@ int pakfire_filelist_create_from_file(PakfireFilelist* list, Pakfire pakfire, if (!data) return 0; - PakfireFile file = NULL; + struct pakfire_file* file = NULL; char* tok = NULL; char* line = strtok_r(data, "\n", &tok); @@ -450,7 +450,7 @@ int pakfire_filelist_scan(PakfireFilelist list, const char* root, } // Create file - PakfireFile file; + struct pakfire_file* file; r = pakfire_file_create(&file, list->pakfire); if (r) goto ERROR; @@ -488,7 +488,7 @@ int pakfire_filelist_contains(PakfireFilelist list, const char* pattern) { } for (unsigned int i = 0; i < list->size; i++) { - PakfireFile file = list->elements[i]; + struct pakfire_file* file = list->elements[i]; const char* path = pakfire_file_get_path(file); if (!path) @@ -504,7 +504,7 @@ int pakfire_filelist_contains(PakfireFilelist list, const char* pattern) { int pakfire_filelist_export(PakfireFilelist list, FILE* f) { for (unsigned int i = 0; i < list->size; i++) { - PakfireFile file = list->elements[i]; + struct pakfire_file* file = list->elements[i]; const char* path = pakfire_file_get_path(file); if (!path) diff --git a/src/libpakfire/include/pakfire/file.h b/src/libpakfire/include/pakfire/file.h index 3dab78e32..a560f5d08 100644 --- a/src/libpakfire/include/pakfire/file.h +++ b/src/libpakfire/include/pakfire/file.h @@ -27,53 +27,55 @@ #include -int pakfire_file_create(PakfireFile* file, Pakfire pakfire); +struct pakfire_file; -PakfireFile pakfire_file_ref(PakfireFile file); -PakfireFile pakfire_file_unref(PakfireFile file); +int pakfire_file_create(struct pakfire_file** file, Pakfire pakfire); -int pakfire_file_cmp(PakfireFile file1, PakfireFile file2); +struct pakfire_file* pakfire_file_ref(struct pakfire_file* file); +struct pakfire_file* pakfire_file_unref(struct pakfire_file* file); -const char* pakfire_file_get_path(PakfireFile file); -int pakfire_file_set_path(PakfireFile file, const char* path); +int pakfire_file_cmp(struct pakfire_file* file1, struct pakfire_file* file2); -int pakfire_file_get_type(PakfireFile file); +const char* pakfire_file_get_path(struct pakfire_file* file); +int pakfire_file_set_path(struct pakfire_file* file, const char* path); -ssize_t pakfire_file_get_size(PakfireFile file); -void pakfire_file_set_size(PakfireFile file, ssize_t size); +int pakfire_file_get_type(struct pakfire_file* file); -const char* pakfire_file_get_user(PakfireFile file); -void pakfire_file_set_user(PakfireFile file, const char* user); +ssize_t pakfire_file_get_size(struct pakfire_file* file); +void pakfire_file_set_size(struct pakfire_file* file, ssize_t size); -const char* pakfire_file_get_group(PakfireFile file); -void pakfire_file_set_group(PakfireFile file, const char* group); +const char* pakfire_file_get_user(struct pakfire_file* file); +void pakfire_file_set_user(struct pakfire_file* file, const char* user); -mode_t pakfire_file_get_mode(PakfireFile file); -void pakfire_file_set_mode(PakfireFile file, mode_t mode); +const char* pakfire_file_get_group(struct pakfire_file* file); +void pakfire_file_set_group(struct pakfire_file* file, const char* group); -time_t pakfire_file_get_ctime(PakfireFile file); -void pakfire_file_set_ctime(PakfireFile file, time_t time); -time_t pakfire_file_get_mtime(PakfireFile file); -void pakfire_file_set_mtime(PakfireFile file, time_t time); +mode_t pakfire_file_get_mode(struct pakfire_file* file); +void pakfire_file_set_mode(struct pakfire_file* file, mode_t mode); -const char* pakfire_file_get_chksum(PakfireFile file); -void pakfire_file_set_chksum(PakfireFile file, const char* chksum); +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); -PakfireFile pakfire_file_parse_from_file(const char* list, unsigned int format); +const char* pakfire_file_get_chksum(struct pakfire_file* file); +void pakfire_file_set_chksum(struct pakfire_file* file, const char* chksum); + +struct pakfire_file* pakfire_file_parse_from_file(const char* list, unsigned int format); #ifdef PAKFIRE_PRIVATE #include -int pakfire_file_create_from_archive_entry(PakfireFile* file, Pakfire pakfire, +int pakfire_file_create_from_archive_entry(struct pakfire_file** file, Pakfire pakfire, struct archive_entry* entry); -struct archive_entry* pakfire_file_archive_entry(PakfireFile file); -int pakfire_file_copy_archive_entry(PakfireFile file, struct archive_entry* entry); +struct archive_entry* pakfire_file_archive_entry(struct pakfire_file* file); +int pakfire_file_copy_archive_entry(struct pakfire_file* file, struct archive_entry* entry); -const char* pakfire_file_get_abspath(PakfireFile file); -int pakfire_file_set_abspath(PakfireFile file, const char* path); +const char* pakfire_file_get_abspath(struct pakfire_file* file); +int pakfire_file_set_abspath(struct pakfire_file* file, const char* path); -int pakfire_file_cleanup(PakfireFile file); +int pakfire_file_cleanup(struct pakfire_file* file); #endif diff --git a/src/libpakfire/include/pakfire/filelist.h b/src/libpakfire/include/pakfire/filelist.h index 9321b8880..a32ff93fa 100644 --- a/src/libpakfire/include/pakfire/filelist.h +++ b/src/libpakfire/include/pakfire/filelist.h @@ -21,6 +21,7 @@ #ifndef PAKFIRE_FILELIST_H #define PAKFIRE_FILELIST_H +#include #include int pakfire_filelist_create(PakfireFilelist* list, Pakfire pakfire); @@ -32,8 +33,8 @@ size_t pakfire_filelist_size(PakfireFilelist list); int pakfire_filelist_is_empty(PakfireFilelist list); void pakfire_filelist_clear(PakfireFilelist list); -PakfireFile pakfire_filelist_get(PakfireFilelist list, size_t index); -int pakfire_filelist_append(PakfireFilelist list, PakfireFile file); +struct pakfire_file* pakfire_filelist_get(PakfireFilelist list, size_t index); +int pakfire_filelist_append(PakfireFilelist list, struct pakfire_file* file); void pakfire_filelist_sort(PakfireFilelist list); diff --git a/src/libpakfire/include/pakfire/types.h b/src/libpakfire/include/pakfire/types.h index 9f986e9d6..039c3825b 100644 --- a/src/libpakfire/include/pakfire/types.h +++ b/src/libpakfire/include/pakfire/types.h @@ -26,7 +26,6 @@ typedef struct _Pakfire* Pakfire; typedef struct _PakfireArchive* PakfireArchive; typedef struct _PakfireArchiveSignature* PakfireArchiveSignature; -typedef struct _PakfireFile* PakfireFile; typedef struct _PakfireFilelist* PakfireFilelist; typedef struct _PakfireKey* PakfireKey; typedef struct _PakfirePackage* PakfirePackage; diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index a4c08d575..2a9db469b 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -906,7 +906,7 @@ PAKFIRE_EXPORT char* pakfire_package_dump(PakfirePackage pkg, int flags) { const char* prefix = _("Filelist"); for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) { - PakfireFile file = pakfire_filelist_get(filelist, i); + struct pakfire_file* file = pakfire_filelist_get(filelist, i); const char* path = pakfire_file_get_path(file); pakfire_package_dump_add_line(&string, prefix, path); @@ -957,7 +957,7 @@ static int pakfire_package_fetch_legacy_filelist(PakfirePackage pkg, PakfireFile const char* path = pool_dep2str(p, id); if (found_marker) { - PakfireFile file; + struct pakfire_file* file; int r = pakfire_file_create(&file, pkg->pakfire); if (r) @@ -993,7 +993,7 @@ static int pakfire_package_fetch_filelist(PakfirePackage pkg, PakfireFilelist fi SOLVABLE_FILELIST, NULL, SEARCH_FILES | SEARCH_COMPLETE_FILELIST); while (dataiterator_step(&di)) { - PakfireFile file; + struct pakfire_file* file; r = pakfire_file_create(&file, pkg->pakfire); if (r) @@ -1065,7 +1065,7 @@ PAKFIRE_EXPORT int pakfire_package_set_filelist(PakfirePackage pkg, PakfireFilel int r; for (unsigned int i = 0; i < pakfire_filelist_size(filelist); i++) { - PakfireFile file = pakfire_filelist_get(filelist, i); + struct pakfire_file* file = pakfire_filelist_get(filelist, i); const char* path = pakfire_file_get_path(file); if (path) { diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c index cd99337ab..382c3ee90 100644 --- a/src/libpakfire/repo.c +++ b/src/libpakfire/repo.c @@ -880,7 +880,7 @@ PAKFIRE_EXPORT int pakfire_repo_scan(PakfireRepo repo, int flags) { r = pakfire_progressbar_start(progressbar, num_files); for (unsigned int i = 0; i < num_files; i++) { - PakfireFile file = pakfire_filelist_get(filelist, i); + struct pakfire_file* file = pakfire_filelist_get(filelist, i); // Increment progress bar pakfire_progressbar_increment(progressbar, 1);