From: Michael Tremer Date: Fri, 9 Jul 2021 14:49:59 +0000 (+0000) Subject: pakfire: Change type from Pakfire to struct pakfire X-Git-Tag: 0.9.28~1060 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac4c607be916e6289a67b6985a17004780e84088;p=pakfire.git pakfire: Change type from Pakfire to struct pakfire Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 509b5360e..408c139c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -281,7 +281,6 @@ pkginclude_HEADERS += \ src/libpakfire/include/pakfire/snapshot.h \ src/libpakfire/include/pakfire/solution.h \ src/libpakfire/include/pakfire/transaction.h \ - src/libpakfire/include/pakfire/types.h \ src/libpakfire/include/pakfire/ui.h \ src/libpakfire/include/pakfire/util.h diff --git a/src/_pakfire/archive.c b/src/_pakfire/archive.c index a5ac8a9f7..2745d1b3a 100644 --- a/src/_pakfire/archive.c +++ b/src/_pakfire/archive.c @@ -129,7 +129,7 @@ static PyObject* Archive_extract(ArchiveObject* self, PyObject* args) { } static PyObject* Archive_get_package(ArchiveObject* self) { - Pakfire pakfire = pakfire_archive_get_pakfire(self->archive); + struct pakfire* pakfire = pakfire_archive_get_pakfire(self->archive); struct pakfire_repo* repo = pakfire_get_repo(pakfire, "@dummy"); if (!repo) diff --git a/src/_pakfire/package.c b/src/_pakfire/package.c index b5a729d52..59fea6c4f 100644 --- a/src/_pakfire/package.c +++ b/src/_pakfire/package.c @@ -558,7 +558,7 @@ static int Package_set_filelist(PackageObject* self, PyObject* value) { return -1; } - Pakfire pakfire = pakfire_package_get_pakfire(self->package); + struct pakfire* pakfire = pakfire_package_get_pakfire(self->package); // Create a new filelist struct pakfire_filelist* filelist; diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c index d91abc5f2..448304751 100644 --- a/src/_pakfire/pakfire.c +++ b/src/_pakfire/pakfire.c @@ -622,7 +622,7 @@ static PyObject* Pakfire_version_compare(PakfireObject* self, PyObject* args) { static PyObject* Pakfire_execute_logging_callback = NULL; -static int __Pakfire_execute_logging_callback(Pakfire pakfire, void* data, +static int __Pakfire_execute_logging_callback(struct pakfire* pakfire, void* data, int priority, const char* line, size_t length) { int r = 0; diff --git a/src/_pakfire/pakfire.h b/src/_pakfire/pakfire.h index 208ad4d94..c8215766e 100644 --- a/src/_pakfire/pakfire.h +++ b/src/_pakfire/pakfire.h @@ -27,7 +27,7 @@ typedef struct { PyObject_HEAD - Pakfire pakfire; + struct pakfire* pakfire; PyObject* logger; } PakfireObject; diff --git a/src/_pakfire/repo.c b/src/_pakfire/repo.c index 261b4ffb8..764d104c6 100644 --- a/src/_pakfire/repo.c +++ b/src/_pakfire/repo.c @@ -282,7 +282,7 @@ static PyObject* Repo__add_package(RepoObject* self, PyObject* args) { if (!PyArg_ParseTuple(args, "sss", &name, &evr, &arch)) return NULL; - Pakfire pakfire = pakfire_repo_get_pakfire(self->repo); + struct pakfire* pakfire = pakfire_repo_get_pakfire(self->repo); struct pakfire_package* pkg = pakfire_package_create(pakfire, self->repo, name, evr, arch); PyObject* obj = new_package(&PackageType, pkg); diff --git a/src/_pakfire/util.c b/src/_pakfire/util.c index 5c655b3ba..7e24e6e06 100644 --- a/src/_pakfire/util.c +++ b/src/_pakfire/util.c @@ -26,7 +26,6 @@ #include #include -#include #include "package.h" #include "util.h" diff --git a/src/libpakfire/archive.c b/src/libpakfire/archive.c index 66b48fc7a..46973f69b 100644 --- a/src/libpakfire/archive.c +++ b/src/libpakfire/archive.c @@ -61,7 +61,7 @@ struct pakfire_archive_chksum { }; struct pakfire_archive { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; char path[PATH_MAX]; @@ -355,7 +355,7 @@ static void pakfire_archive_free(struct pakfire_archive* archive) { free(archive); } -static int pakfire_archive_create(struct pakfire_archive** archive, Pakfire pakfire) { +static int pakfire_archive_create(struct pakfire_archive** archive, struct pakfire* pakfire) { struct pakfire_archive* a = calloc(1, sizeof(*a)); if (!a) return ENOMEM; @@ -385,7 +385,7 @@ PAKFIRE_EXPORT struct pakfire_archive* pakfire_archive_unref(struct pakfire_arch return NULL; } -PAKFIRE_EXPORT Pakfire pakfire_archive_get_pakfire(struct pakfire_archive* archive) { +PAKFIRE_EXPORT struct pakfire* pakfire_archive_get_pakfire(struct pakfire_archive* archive) { return pakfire_ref(archive->pakfire); } @@ -723,7 +723,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_archive_open(struct pakfire_archive** archive, Pakfire pakfire, const char* path) { +PAKFIRE_EXPORT int pakfire_archive_open(struct pakfire_archive** archive, struct pakfire* pakfire, const char* path) { int r = pakfire_archive_create(archive, pakfire); if (r) return r; @@ -1099,7 +1099,7 @@ PAKFIRE_EXPORT struct pakfire_filelist* pakfire_archive_get_filelist(struct pakf return pakfire_filelist_ref(archive->filelist); } -static pakfire_archive_verify_status_t pakfire_archive_verify_file(Pakfire pakfire, +static pakfire_archive_verify_status_t pakfire_archive_verify_file(struct pakfire* pakfire, struct archive* a, const struct pakfire_archive_chksum* chksum) { pakfire_archive_verify_status_t status = PAKFIRE_ARCHIVE_VERIFY_ERROR; diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c index 7e99f4dc2..d176d1da5 100644 --- a/src/libpakfire/build.c +++ b/src/libpakfire/build.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #define CCACHE_DIR "/var/cache/ccache" @@ -60,7 +59,7 @@ static const char* stages[] = { "\n" \ "exit 0\n" -static int pakfire_build_install_packages(Pakfire pakfire, int* snapshot_needs_update) { +static int pakfire_build_install_packages(struct pakfire* pakfire, int* snapshot_needs_update) { char** packages = NULL; int r = 1; @@ -117,7 +116,7 @@ ERROR: return r; } -int pakfire_build_setup(Pakfire pakfire) { +int pakfire_build_setup(struct pakfire* pakfire) { char path[PATH_MAX]; int r; @@ -187,7 +186,7 @@ int pakfire_build_setup(Pakfire pakfire) { return 0; } -static int pakfire_build_run_script(Pakfire pakfire, const char* filename, const char* args[], +static int pakfire_build_run_script(struct pakfire* pakfire, const char* filename, const char* args[], pakfire_execute_logging_callback logging_callback, void* data) { char* script = NULL; size_t size = 0; @@ -242,7 +241,7 @@ static int find_dependency(char** haystack, const char* needle) { return 0; } -static int pakfire_build_find_dependencies(Pakfire pakfire, +static int pakfire_build_find_dependencies(struct pakfire* pakfire, struct pakfire_package* pkg, struct pakfire_filelist* filelist, const char* buildroot) { char** provides = NULL; char** requires = NULL; @@ -349,7 +348,7 @@ static int append_to_array(const char*** array, const char* s) { return 0; } -static int pakfire_build_package_add_files(Pakfire pakfire, struct pakfire_parser* makefile, +static int pakfire_build_package_add_files(struct pakfire* pakfire, struct pakfire_parser* makefile, const char* buildroot, const char* namespace, struct pakfire_package* pkg, struct pakfire_packager* packager) { struct pakfire_filelist* filelist = NULL; @@ -445,7 +444,7 @@ ERROR: return r; } -static int pakfire_build_add_scriptlet_requires(Pakfire pakfire, struct pakfire_package* pkg, +static int pakfire_build_add_scriptlet_requires(struct pakfire* pakfire, struct pakfire_package* pkg, struct pakfire_scriptlet* scriptlet) { char** prerequires = NULL; char path[PATH_MAX]; @@ -509,7 +508,7 @@ ERROR: return r; } -static int pakfire_build_package_add_scriptlet(Pakfire pakfire, struct pakfire_package* pkg, +static int pakfire_build_package_add_scriptlet(struct pakfire* pakfire, struct pakfire_package* pkg, struct pakfire_packager* packager, const char* type, const char* data) { struct pakfire_scriptlet* scriptlet = NULL; char* shell = NULL; @@ -551,7 +550,7 @@ ERROR: return r; } -static int pakfire_build_package_add_scriptlets(Pakfire pakfire, struct pakfire_parser* makefile, +static int pakfire_build_package_add_scriptlets(struct pakfire* pakfire, struct pakfire_parser* makefile, const char* namespace, struct pakfire_package* pkg, struct pakfire_packager* packager) { char name[NAME_MAX]; int r; @@ -579,7 +578,7 @@ static int pakfire_build_package_add_scriptlets(Pakfire pakfire, struct pakfire_ return 0; } -static int pakfire_build_package(Pakfire pakfire, struct pakfire_parser* makefile, +static int pakfire_build_package(struct pakfire* pakfire, struct pakfire_parser* makefile, uuid_t* build_id, const char* buildroot, const char* namespace, const char* target) { struct pakfire_repo* repo = NULL; struct pakfire_package* pkg = NULL; @@ -663,7 +662,7 @@ ERROR: return r; } -static int pakfire_build_packages(Pakfire pakfire, struct pakfire_parser* makefile, +static int pakfire_build_packages(struct pakfire* pakfire, struct pakfire_parser* makefile, uuid_t* build_id, const char* buildroot, const char* target) { DEBUG(pakfire, "Creating packages..."); int r = 1; @@ -700,7 +699,7 @@ ERROR: return r; } -static int pakfire_build_stage(Pakfire pakfire, struct pakfire_parser* makefile, const char* stage, +static int pakfire_build_stage(struct pakfire* pakfire, struct pakfire_parser* makefile, const char* stage, pakfire_execute_logging_callback logging_callback, void* data) { char template[1024]; @@ -755,7 +754,7 @@ static const char* post_build_scripts[] = { NULL, }; -static int pakfire_build_run_post_build_scripts(Pakfire pakfire, const char* buildroot, +static int pakfire_build_run_post_build_scripts(struct pakfire* pakfire, const char* buildroot, pakfire_execute_logging_callback logging_callback, void* data) { // Set default arguments for build scripts const char* args[] = { @@ -772,7 +771,7 @@ static int pakfire_build_run_post_build_scripts(Pakfire pakfire, const char* bui return 0; } -static int pakfire_build_makefile(Pakfire pakfire, const char* path, const char* target, +static int pakfire_build_makefile(struct pakfire* pakfire, const char* path, const char* target, uuid_t* build_id, int flags, pakfire_execute_logging_callback logging_callback, void* data) { struct pakfire_parser* makefile = NULL; @@ -843,7 +842,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_build(Pakfire pakfire, const char* path, +PAKFIRE_EXPORT int pakfire_build(struct pakfire* pakfire, const char* path, const char* target, const char* id, int flags, pakfire_execute_logging_callback logging_callback, void* data) { char makefiles[PATH_MAX]; @@ -921,7 +920,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_shell(Pakfire pakfire) { +PAKFIRE_EXPORT int pakfire_shell(struct pakfire* pakfire) { const char* argv[] = { "/bin/bash", "--login", NULL, }; diff --git a/src/libpakfire/cgroup.c b/src/libpakfire/cgroup.c index 555a75848..37bd171d1 100644 --- a/src/libpakfire/cgroup.c +++ b/src/libpakfire/cgroup.c @@ -32,7 +32,6 @@ #include #include -#include #include /* @@ -103,7 +102,7 @@ static char* pakfire_cgroup_parent_name(const char* group) { return parent; } -static int pakfire_cgroup_supported(Pakfire pakfire) { +static int pakfire_cgroup_supported(struct pakfire* pakfire) { if (pakfire_cgroups_supported < 0) { struct statfs fs; @@ -125,7 +124,7 @@ static int pakfire_cgroup_supported(Pakfire pakfire) { return pakfire_cgroups_supported; } -static int pakfire_cgroup_make_path(Pakfire pakfire, char* path, size_t length, +static int pakfire_cgroup_make_path(struct pakfire* pakfire, char* path, size_t length, const char* subgroup, const char* file) { // Store up to where we have written and how much space is left char* p = path; @@ -163,7 +162,7 @@ static int pakfire_cgroup_make_path(Pakfire pakfire, char* path, size_t length, return length - l; } -static FILE* pakfire_cgroup_fopen(Pakfire pakfire, +static FILE* pakfire_cgroup_fopen(struct pakfire* pakfire, const char* group, const char* file, const char* mode) { char path[PATH_MAX]; @@ -180,7 +179,7 @@ static FILE* pakfire_cgroup_fopen(Pakfire pakfire, return f; } -static int pakfire_cgroup_fprintf(Pakfire pakfire, +static int pakfire_cgroup_fprintf(struct pakfire* pakfire, const char* group, const char* file, const char* format, ...) { char buffer[64]; ssize_t length; @@ -209,7 +208,7 @@ static int pakfire_cgroup_fprintf(Pakfire pakfire, return r; } -static int pakfire_cgroup_enable_controller(Pakfire pakfire, +static int pakfire_cgroup_enable_controller(struct pakfire* pakfire, const char* group, const char* controller) { // Enable controller int r = pakfire_cgroup_fprintf(pakfire, group, "cgroup.subtree_control", @@ -239,7 +238,7 @@ static int pakfire_cgroup_enable_controller(Pakfire pakfire, return 0; } -static int pakfire_cgroup_enable_controllers(Pakfire pakfire, +static int pakfire_cgroup_enable_controllers(struct pakfire* pakfire, const char* group, const char** controllers) { int r; @@ -253,7 +252,7 @@ static int pakfire_cgroup_enable_controllers(Pakfire pakfire, return 0; } -int pakfire_cgroup_create(Pakfire pakfire, const char* group) { +int pakfire_cgroup_create(struct pakfire* pakfire, const char* group) { int supported = pakfire_cgroup_supported(pakfire); if (!supported) { errno = ENOTSUP; @@ -304,7 +303,7 @@ int pakfire_cgroup_create(Pakfire pakfire, const char* group) { return 0; } -int pakfire_cgroup_destroy(Pakfire pakfire, const char* group) { +int pakfire_cgroup_destroy(struct pakfire* pakfire, const char* group) { // Never attempt to destroy root if (!*group) return EINVAL; @@ -325,7 +324,7 @@ int pakfire_cgroup_destroy(Pakfire pakfire, const char* group) { return 0; } -DIR* pakfire_cgroup_opendir(Pakfire pakfire, const char* group) { +DIR* pakfire_cgroup_opendir(struct pakfire* pakfire, const char* group) { // Make path char path[PATH_MAX]; int r = pakfire_cgroup_make_path(pakfire, path, sizeof(path) - 1, group, NULL); @@ -335,7 +334,7 @@ DIR* pakfire_cgroup_opendir(Pakfire pakfire, const char* group) { return opendir(path); } -int pakfire_cgroup_attach(Pakfire pakfire, const char* group, pid_t pid) { +int pakfire_cgroup_attach(struct pakfire* pakfire, const char* group, pid_t pid) { int r = pakfire_cgroup_fprintf(pakfire, group, "cgroup.procs", "%d", pid); if (r < 0) { ERROR(pakfire, "Could not attach process %d to cgroup %s: %m\n", pid, group); @@ -346,7 +345,7 @@ int pakfire_cgroup_attach(Pakfire pakfire, const char* group, pid_t pid) { return 0; } -int pakfire_cgroup_detach(Pakfire pakfire, const char* group, pid_t pid) { +int pakfire_cgroup_detach(struct pakfire* pakfire, const char* group, pid_t pid) { char* parent = pakfire_cgroup_parent_name(group); if (!parent) return EINVAL; @@ -370,8 +369,8 @@ int pakfire_cgroup_detach(Pakfire pakfire, const char* group, pid_t pid) { return 1; } -static ssize_t pakfire_cgroup_procs_callback(Pakfire pakfire, const char* group, - int (*func)(Pakfire pakfire, pid_t pid, void* data), void* data) { +static ssize_t pakfire_cgroup_procs_callback(struct pakfire* pakfire, const char* group, + int (*func)(struct pakfire* pakfire, pid_t pid, void* data), void* data) { FILE* f = pakfire_cgroup_fopen(pakfire, group, "cgroup.procs", "r"); if (!f) return -1; @@ -409,11 +408,11 @@ static ssize_t pakfire_cgroup_procs_callback(Pakfire pakfire, const char* group, return num_processes; } -ssize_t pakfire_cgroup_num_processes(Pakfire pakfire, const char* group) { +ssize_t pakfire_cgroup_num_processes(struct pakfire* pakfire, const char* group) { return pakfire_cgroup_procs_callback(pakfire, group, NULL, NULL); } -static int send_signal(Pakfire pakfire, pid_t pid, void* data) { +static int send_signal(struct pakfire* pakfire, pid_t pid, void* data) { int* signum = (int*)data; DEBUG(pakfire, "Sending signal %d to PID %d\n", *signum, pid); @@ -427,7 +426,7 @@ static int send_signal(Pakfire pakfire, pid_t pid, void* data) { return 0; } -int pakfire_cgroup_killall(Pakfire pakfire, const char* group) { +int pakfire_cgroup_killall(struct pakfire* pakfire, const char* group) { DEBUG(pakfire, "Killing all processes in cgroup %s\n", group); int signum = SIGTERM; @@ -453,7 +452,7 @@ int pakfire_cgroup_killall(Pakfire pakfire, const char* group) { return 1; } -int pakfire_cgroup_cpustat(Pakfire pakfire, const char* group, +int pakfire_cgroup_cpustat(struct pakfire* pakfire, const char* group, struct pakfire_cgroup_cpustat* st) { FILE* f = pakfire_cgroup_fopen(pakfire, group, "cpu.stat", "r"); if (!f) @@ -495,7 +494,7 @@ int pakfire_cgroup_cpustat(Pakfire pakfire, const char* group, return 0; } -int pakfire_cgroup_set_nice(Pakfire pakfire, const char* group, int level) { +int pakfire_cgroup_set_nice(struct pakfire* pakfire, const char* group, int level) { DEBUG(pakfire, "Setting nice level of cgroup %s to %d\n", group, level); int r = pakfire_cgroup_fprintf(pakfire, group, "cpu.weight.nice", "%d", level); diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c index 344e93e78..a79760144 100644 --- a/src/libpakfire/db.c +++ b/src/libpakfire/db.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #define DATABASE_PATH PAKFIRE_PRIVATE_DIR "/packages.db" @@ -43,7 +42,7 @@ #define SCHEMA_MIN_SUP 7 struct pakfire_db { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; char path[PATH_MAX]; @@ -54,7 +53,7 @@ struct pakfire_db { }; static void logging_callback(void* data, int r, const char* msg) { - Pakfire pakfire = (Pakfire)data; + struct pakfire* pakfire = (struct pakfire*)data; ERROR(pakfire, "Database Error: %s: %s\n", sqlite3_errstr(r), msg); @@ -451,7 +450,7 @@ static int pakfire_db_setup(struct pakfire_db* db) { return 0; } -int pakfire_db_open(struct pakfire_db** db, Pakfire pakfire, int flags) { +int pakfire_db_open(struct pakfire_db** db, struct pakfire* pakfire, int flags) { int r = 1; struct pakfire_db* o = calloc(1, sizeof(*o)); @@ -656,7 +655,7 @@ ssize_t pakfire_db_packages(struct pakfire_db* db) { return packages; } -static void pakfire_db_add_userinstalled(Pakfire pakfire, const char* name) { +static void pakfire_db_add_userinstalled(struct pakfire* pakfire, const char* name) { Pool* pool = pakfire_get_solv_pool(pakfire); // Convert name to ID diff --git a/src/libpakfire/dist.c b/src/libpakfire/dist.c index 3459cd13d..ca5c4105a 100644 --- a/src/libpakfire/dist.c +++ b/src/libpakfire/dist.c @@ -35,7 +35,6 @@ #include #include #include -#include #include // XXX for now @@ -44,7 +43,7 @@ #define PAKFIRE_MACROS_DIR "/usr/lib/pakfire/macros" #define PAKFIRE_MACROS_GLOB_PATTERN PAKFIRE_MACROS_DIR "/*.macro" -static int pakfire_makefile_set_defaults(Pakfire pakfire, +static int pakfire_makefile_set_defaults(struct pakfire* pakfire, struct pakfire_parser* parser, const char* path) { char buffer[1024]; int r; @@ -125,7 +124,7 @@ static int pakfire_makefile_set_defaults(Pakfire pakfire, return 0; } -int pakfire_read_makefile(struct pakfire_parser** parser, Pakfire pakfire, +int pakfire_read_makefile(struct pakfire_parser** parser, struct pakfire* pakfire, const char* path, struct pakfire_parser_error** error) { int r = 1; @@ -196,7 +195,7 @@ ERROR: } static int pakfire_dist_create_downloader_and_mirrorlist( - Pakfire pakfire, struct pakfire_parser* makefile, + struct pakfire* pakfire, struct pakfire_parser* makefile, struct pakfire_downloader** downloader, struct pakfire_mirrorlist** mirrorlist) { // Create the downloader int r = pakfire_downloader_create(downloader, pakfire); @@ -239,7 +238,7 @@ ERROR: return r; } -static int pakfire_dist_add_source(Pakfire pakfire, struct pakfire_packager* packager, +static int pakfire_dist_add_source(struct pakfire* pakfire, struct pakfire_packager* packager, struct pakfire_package* pkg, struct pakfire_downloader* downloader, struct pakfire_mirrorlist* mirrorlist, const char* filename) { int r; @@ -263,7 +262,7 @@ static int pakfire_dist_add_source(Pakfire pakfire, struct pakfire_packager* pac return pakfire_packager_add(packager, cache_path, archive_path); } -static int pakfire_dist_add_sources(Pakfire pakfire, struct pakfire_packager* packager, +static int pakfire_dist_add_sources(struct pakfire* pakfire, struct pakfire_packager* packager, struct pakfire_package* pkg, struct pakfire_parser* makefile) { // Fetch sources char** sources = pakfire_parser_get_split(makefile, NULL, "sources", ' '); @@ -310,7 +309,7 @@ ERROR: return r; } -static int pakfire_dist_add_files(Pakfire pakfire, struct pakfire_packager* packager, +static int pakfire_dist_add_files(struct pakfire* pakfire, struct pakfire_packager* packager, const char* path) { int r = 1; @@ -366,7 +365,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_dist(Pakfire pakfire, const char* path, const char* target) { +PAKFIRE_EXPORT int pakfire_dist(struct pakfire* pakfire, const char* path, const char* target) { struct pakfire_parser* makefile; struct pakfire_parser_error* error = NULL; diff --git a/src/libpakfire/downloader.c b/src/libpakfire/downloader.c index e31b12892..959c08c17 100644 --- a/src/libpakfire/downloader.c +++ b/src/libpakfire/downloader.c @@ -32,7 +32,6 @@ #include #include #include -#include #include // Retry a mirror up to N times before marking it as broken @@ -71,7 +70,7 @@ struct pakfire_transfer { }; struct pakfire_downloader { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; struct pakfire_progressbar* progressbar; @@ -156,7 +155,7 @@ static void pakfire_downloader_free(struct pakfire_downloader* downloader) { free(downloader); } -int pakfire_downloader_create(struct pakfire_downloader** downloader, Pakfire pakfire) { +int pakfire_downloader_create(struct pakfire_downloader** downloader, struct pakfire* pakfire) { // Fail if pakfire is running in offline mode if (pakfire_has_flag(pakfire, PAKFIRE_FLAGS_OFFLINE)) { ERROR(pakfire, "Cannot initialize downloader in offline mode\n"); @@ -217,7 +216,7 @@ struct pakfire_downloader* pakfire_downloader_unref(struct pakfire_downloader* d #ifdef ENABLE_DEBUG static int debug_callback(CURL *handle, curl_infotype type, char* data, size_t size, void* private) { - Pakfire pakfire = (Pakfire)private; + struct pakfire* pakfire = (struct pakfire*)private; switch (type) { case CURLINFO_TEXT: @@ -821,7 +820,7 @@ int pakfire_downloader_run(struct pakfire_downloader* downloader) { } struct pakfire_mirrorlist { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; STAILQ_HEAD(mirrors, pakfire_mirror) mirrors; @@ -842,7 +841,7 @@ static void pakfire_mirrorlist_free(struct pakfire_mirrorlist* ml) { free(ml); } -int pakfire_mirrorlist_create(struct pakfire_mirrorlist** mirrorlist, Pakfire pakfire) { +int pakfire_mirrorlist_create(struct pakfire_mirrorlist** mirrorlist, struct pakfire* pakfire) { struct pakfire_mirrorlist* ml = calloc(1, sizeof(*ml)); if (!ml) return ENOMEM; diff --git a/src/libpakfire/execute.c b/src/libpakfire/execute.c index e0f290fde..93b6c78aa 100644 --- a/src/libpakfire/execute.c +++ b/src/libpakfire/execute.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #define ENVIRON_SIZE 128 @@ -57,7 +56,7 @@ static const struct environ { }; struct pakfire_execute { - Pakfire pakfire; + struct pakfire* pakfire; const char** argv; char* envp[ENVIRON_SIZE]; @@ -86,7 +85,7 @@ static int pakfire_execute_buffer_is_full(const struct pakfire_execute_buffer* b If it finds a whole line in it, it will send it to the logger and repeat the process. If not newline character is found, it will try to read more data until it finds one. */ -static int pakfire_execute_logger_proxy(Pakfire pakfire, int fd, +static int pakfire_execute_logger_proxy(struct pakfire* pakfire, int fd, pakfire_execute_logging_callback logging_callback, void* data, int priority, struct pakfire_execute_buffer* buffer) { char line[BUFFER_SIZE + 1]; @@ -148,7 +147,7 @@ static int pakfire_execute_logger_proxy(Pakfire pakfire, int fd, return 0; } -static int pakfire_execute_logger(Pakfire pakfire, pakfire_execute_logging_callback logging_callback, +static int pakfire_execute_logger(struct pakfire* pakfire, pakfire_execute_logging_callback logging_callback, void* data, pid_t pid, int stdout, int stderr, int* status) { int epollfd = -1; struct epoll_event ev; @@ -252,7 +251,7 @@ OUT: return r; } -static int default_logging_callback(Pakfire pakfire, void* data, int priority, +static int default_logging_callback(struct pakfire* pakfire, void* data, int priority, const char* line, size_t length) { switch (priority) { case LOG_INFO: @@ -267,7 +266,7 @@ static int default_logging_callback(Pakfire pakfire, void* data, int priority, return 0; } -int pakfire_execute_capture_stdout(Pakfire pakfire, void* data, int priority, +int pakfire_execute_capture_stdout(struct pakfire* pakfire, void* data, int priority, const char* line, size_t length) { char** output = (char**)data; @@ -282,7 +281,7 @@ int pakfire_execute_capture_stdout(Pakfire pakfire, void* data, int priority, return default_logging_callback(pakfire, NULL, priority, line, length); } -int pakfire_execute_capture_stdout_to_array(Pakfire pakfire, void* data, int priority, +int pakfire_execute_capture_stdout_to_array(struct pakfire* pakfire, void* data, int priority, const char* line, size_t length) { char*** array = (char***)data; @@ -367,7 +366,7 @@ static int set_environ(struct pakfire_execute* env, const char* key, const char* static int pakfire_execute_fork(void* data) { struct pakfire_execute* env = (struct pakfire_execute*)data; - Pakfire pakfire = env->pakfire; + struct pakfire* pakfire = env->pakfire; const char* root = pakfire_get_path(pakfire); const char* arch = pakfire_get_arch(pakfire); @@ -454,7 +453,7 @@ static int pakfire_execute_fork(void* data) { return r; } -PAKFIRE_EXPORT int pakfire_execute(Pakfire pakfire, const char* argv[], char* envp[], +PAKFIRE_EXPORT int pakfire_execute(struct pakfire* pakfire, const char* argv[], char* envp[], int flags, pakfire_execute_logging_callback logging_callback, void* data) { DIR* cgroupdir = NULL; int r; @@ -659,7 +658,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_execute_command(Pakfire pakfire, const char* command, char* envp[], +PAKFIRE_EXPORT int pakfire_execute_command(struct pakfire* pakfire, const char* command, char* envp[], int flags, pakfire_execute_logging_callback logging_callback, void* data) { const char* argv[2] = { command, NULL, @@ -668,7 +667,7 @@ PAKFIRE_EXPORT int pakfire_execute_command(Pakfire pakfire, const char* command, return pakfire_execute(pakfire, argv, envp, flags, logging_callback, data); } -PAKFIRE_EXPORT int pakfire_execute_script(Pakfire pakfire, const char* script, const size_t size, +PAKFIRE_EXPORT int pakfire_execute_script(struct pakfire* pakfire, const char* script, const size_t size, const char* args[], char* envp[], int flags, pakfire_execute_logging_callback logging_callback, void* data) { const char* root = pakfire_get_path(pakfire); const char** argv = NULL; @@ -750,7 +749,7 @@ out: return r; } -int pakfire_execute_ldconfig(Pakfire pakfire) { +int pakfire_execute_ldconfig(struct pakfire* pakfire) { char path[PATH_MAX]; // Check if ldconfig exists before calling it to avoid overhead diff --git a/src/libpakfire/file.c b/src/libpakfire/file.c index fd517e986..f6e6a75b1 100644 --- a/src/libpakfire/file.c +++ b/src/libpakfire/file.c @@ -36,7 +36,7 @@ #include struct pakfire_file { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; char path[PATH_MAX]; @@ -59,7 +59,7 @@ struct pakfire_file { //int is_datafile; }; -PAKFIRE_EXPORT int pakfire_file_create(struct pakfire_file** file, Pakfire pakfire) { +PAKFIRE_EXPORT int pakfire_file_create(struct pakfire_file** file, struct pakfire* pakfire) { struct pakfire_file* f = calloc(1, sizeof(*f)); if (!f) return -ENOMEM; @@ -71,7 +71,7 @@ PAKFIRE_EXPORT int pakfire_file_create(struct pakfire_file** file, Pakfire pakfi return 0; } -int pakfire_file_create_from_archive_entry(struct pakfire_file** file, Pakfire pakfire, +int pakfire_file_create_from_archive_entry(struct pakfire_file** file, struct pakfire* pakfire, struct archive_entry* entry) { int r = pakfire_file_create(file, pakfire); if (r) diff --git a/src/libpakfire/filelist.c b/src/libpakfire/filelist.c index ffec79906..a8c042e46 100644 --- a/src/libpakfire/filelist.c +++ b/src/libpakfire/filelist.c @@ -34,7 +34,7 @@ #include struct pakfire_filelist { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; struct pakfire_file** elements; @@ -55,7 +55,7 @@ static int pakfire_filelist_grow(struct pakfire_filelist* list, size_t size) { return 0; } -PAKFIRE_EXPORT int pakfire_filelist_create(struct pakfire_filelist** list, Pakfire pakfire) { +PAKFIRE_EXPORT int pakfire_filelist_create(struct pakfire_filelist** list, struct pakfire* pakfire) { struct pakfire_filelist* l = calloc(1, sizeof(*l)); if (!l) return -ENOMEM; @@ -147,7 +147,7 @@ PAKFIRE_EXPORT void pakfire_filelist_sort(struct pakfire_filelist* list) { qsort(list->elements, list->size, sizeof(*list->elements), __sort); } -static int pakfire_filelist_parse_line(struct pakfire_file** file, Pakfire pakfire, +static int pakfire_filelist_parse_line(struct pakfire_file** file, struct pakfire* pakfire, char* line, unsigned int format) { unsigned int i = 0; @@ -264,7 +264,7 @@ static int pakfire_filelist_parse_line(struct pakfire_file** file, Pakfire pakfi return 0; } -int pakfire_filelist_create_from_file(struct pakfire_filelist** list, Pakfire pakfire, +int pakfire_filelist_create_from_file(struct pakfire_filelist** list, struct pakfire* pakfire, char* data, unsigned int format) { int r = pakfire_filelist_create(list, pakfire); if (r) diff --git a/src/libpakfire/include/pakfire/archive.h b/src/libpakfire/include/pakfire/archive.h index 1cf2e2abc..75b52bc33 100644 --- a/src/libpakfire/include/pakfire/archive.h +++ b/src/libpakfire/include/pakfire/archive.h @@ -29,7 +29,6 @@ struct pakfire_archive; #include #include #include -#include typedef enum pakfire_archive_verify_status { PAKFIRE_ARCHIVE_VERIFY_UNKNOWN = 0, @@ -42,10 +41,10 @@ typedef enum pakfire_archive_verify_status { PAKFIRE_ARCHIVE_VERIFY_ERROR, } pakfire_archive_verify_status_t; -int pakfire_archive_open(struct pakfire_archive** archive, Pakfire pakfire, const char* path); +int pakfire_archive_open(struct pakfire_archive** archive, struct 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); +struct pakfire* pakfire_archive_get_pakfire(struct pakfire_archive* archive); char* pakfire_archive_get(struct pakfire_archive* archive, const char* namespace, const char* key); diff --git a/src/libpakfire/include/pakfire/build.h b/src/libpakfire/include/pakfire/build.h index 520ee108f..6f9ead595 100644 --- a/src/libpakfire/include/pakfire/build.h +++ b/src/libpakfire/include/pakfire/build.h @@ -22,16 +22,15 @@ #define PAKFIRE_BUILD_H #include -#include enum pakfire_build_flags { PAKFIRE_BUILD_INTERACTIVE = (1 << 0), }; -int pakfire_build_setup(Pakfire pakfire); +int pakfire_build_setup(struct pakfire* pakfire); -int pakfire_build(Pakfire pakfire, const char* path, const char* target, +int pakfire_build(struct pakfire* pakfire, const char* path, const char* target, const char* id, int flags, pakfire_execute_logging_callback logging_callback, void* data); -int pakfire_shell(Pakfire pakfire); +int pakfire_shell(struct pakfire* pakfire); #endif /* PAKFIRE_BUILD_H */ diff --git a/src/libpakfire/include/pakfire/cgroup.h b/src/libpakfire/include/pakfire/cgroup.h index df8fb4d2d..2b0818f04 100644 --- a/src/libpakfire/include/pakfire/cgroup.h +++ b/src/libpakfire/include/pakfire/cgroup.h @@ -27,21 +27,21 @@ #include #include -#include +#include int pakfire_cgroup_random_name(char* template); -int pakfire_cgroup_create(Pakfire pakfire, const char* group); -int pakfire_cgroup_destroy(Pakfire pakfire, const char* group); +int pakfire_cgroup_create(struct pakfire* pakfire, const char* group); +int pakfire_cgroup_destroy(struct pakfire* pakfire, const char* group); -DIR* pakfire_cgroup_opendir(Pakfire pakfire, const char* group); +DIR* pakfire_cgroup_opendir(struct pakfire* pakfire, const char* group); -int pakfire_cgroup_attach(Pakfire pakfire, const char* group, pid_t pid); -int pakfire_cgroup_detach(Pakfire pakfire, const char* group, pid_t pid); +int pakfire_cgroup_attach(struct pakfire* pakfire, const char* group, pid_t pid); +int pakfire_cgroup_detach(struct pakfire* pakfire, const char* group, pid_t pid); -ssize_t pakfire_cgroup_num_processes(Pakfire pakfire, const char* group); +ssize_t pakfire_cgroup_num_processes(struct pakfire* pakfire, const char* group); -int pakfire_cgroup_killall(Pakfire pakfire, const char* group); +int pakfire_cgroup_killall(struct pakfire* pakfire, const char* group); struct pakfire_cgroup_cpustat { struct timeval usage; @@ -49,10 +49,10 @@ struct pakfire_cgroup_cpustat { struct timeval system; }; -int pakfire_cgroup_cpustat(Pakfire pakfire, const char* group, +int pakfire_cgroup_cpustat(struct pakfire* pakfire, const char* group, struct pakfire_cgroup_cpustat* st); -int pakfire_cgroup_set_nice(Pakfire pakfire, const char* group, int level); +int pakfire_cgroup_set_nice(struct pakfire* pakfire, const char* group, int level); #endif diff --git a/src/libpakfire/include/pakfire/db.h b/src/libpakfire/include/pakfire/db.h index 898d044d0..59838dd98 100644 --- a/src/libpakfire/include/pakfire/db.h +++ b/src/libpakfire/include/pakfire/db.h @@ -27,9 +27,9 @@ #include #include +#include #include #include -#include struct pakfire_db; @@ -38,7 +38,7 @@ enum { PAKFIRE_DB_READWRITE = (1 << 0), }; -int pakfire_db_open(struct pakfire_db** db, Pakfire pakfire, int flags); +int pakfire_db_open(struct pakfire_db** db, struct pakfire* pakfire, int flags); struct pakfire_db* pakfire_db_ref(struct pakfire_db* db); struct pakfire_db* pakfire_db_unref(struct pakfire_db* db); diff --git a/src/libpakfire/include/pakfire/dist.h b/src/libpakfire/include/pakfire/dist.h index db8fdc245..417d308b0 100644 --- a/src/libpakfire/include/pakfire/dist.h +++ b/src/libpakfire/include/pakfire/dist.h @@ -21,15 +21,15 @@ #ifndef PAKFIRE_DIST_H #define PAKFIRE_DIST_H -#include +#include -int pakfire_dist(Pakfire pakfire, const char* path, const char* target); +int pakfire_dist(struct pakfire* pakfire, const char* path, const char* target); #ifdef PAKFIRE_PRIVATE #include -int pakfire_read_makefile(struct pakfire_parser** parser, Pakfire pakfire, +int pakfire_read_makefile(struct pakfire_parser** parser, struct pakfire* pakfire, const char* path, struct pakfire_parser_error** error); #endif diff --git a/src/libpakfire/include/pakfire/downloader.h b/src/libpakfire/include/pakfire/downloader.h index 27448af62..34c05f963 100644 --- a/src/libpakfire/include/pakfire/downloader.h +++ b/src/libpakfire/include/pakfire/downloader.h @@ -23,18 +23,18 @@ #ifdef PAKFIRE_PRIVATE -#include - struct pakfire_downloader; struct pakfire_mirrorlist; +#include + enum pakfire_transfer_flags { PAKFIRE_TRANSFER_NONE = 0, PAKFIRE_TRANSFER_NOPROGRESS = (1 << 0), PAKFIRE_TRANSFER_NOTEMP = (1 << 1), }; -int pakfire_downloader_create(struct pakfire_downloader** downloader, Pakfire pakfire); +int pakfire_downloader_create(struct pakfire_downloader** downloader, struct pakfire* pakfire); struct pakfire_downloader* pakfire_downloader_ref(struct pakfire_downloader* downloader); struct pakfire_downloader* pakfire_downloader_unref(struct pakfire_downloader* downloader); @@ -50,7 +50,7 @@ int pakfire_downloader_run(struct pakfire_downloader* downloader); // Mirror lists -int pakfire_mirrorlist_create(struct pakfire_mirrorlist** ml, Pakfire pakfire); +int pakfire_mirrorlist_create(struct pakfire_mirrorlist** ml, struct pakfire* pakfire); struct pakfire_mirrorlist* pakfire_mirrorlist_ref(struct pakfire_mirrorlist* ml); struct pakfire_mirrorlist* pakfire_mirrorlist_unref(struct pakfire_mirrorlist* ml); diff --git a/src/libpakfire/include/pakfire/execute.h b/src/libpakfire/include/pakfire/execute.h index c1e6b1d5a..07317ec1a 100644 --- a/src/libpakfire/include/pakfire/execute.h +++ b/src/libpakfire/include/pakfire/execute.h @@ -21,16 +21,16 @@ #ifndef PAKFIRE_EXECUTE_H #define PAKFIRE_EXECUTE_H -#include +#include -typedef int (*pakfire_execute_logging_callback)(Pakfire pakfire, void* data, +typedef int (*pakfire_execute_logging_callback)(struct pakfire* pakfire, void* data, int priority, const char* line, size_t length); -int pakfire_execute(Pakfire pakfire, const char* argv[], char* envp[], +int pakfire_execute(struct pakfire* pakfire, const char* argv[], char* envp[], int flags, pakfire_execute_logging_callback logging_callback, void* data); -int pakfire_execute_command(Pakfire pakfire, const char* command, char* envp[], +int pakfire_execute_command(struct pakfire* pakfire, const char* command, char* envp[], int flags, pakfire_execute_logging_callback logging_callback, void* data); -int pakfire_execute_script(Pakfire pakfire, const char* script, const size_t size, +int pakfire_execute_script(struct pakfire* pakfire, const char* script, const size_t size, const char* args[], char* envp[], int flags, pakfire_execute_logging_callback logging_callback, void* data); enum { @@ -41,11 +41,11 @@ enum { #ifdef PAKFIRE_PRIVATE -int pakfire_execute_capture_stdout(Pakfire pakfire, void* data, int priority, +int pakfire_execute_capture_stdout(struct pakfire* pakfire, void* data, int priority, const char* line, size_t length); -int pakfire_execute_capture_stdout_to_array(Pakfire pakfire, void* data, int priority, +int pakfire_execute_capture_stdout_to_array(struct pakfire* pakfire, void* data, int priority, const char* line, size_t length); -int pakfire_execute_ldconfig(Pakfire pakfire); +int pakfire_execute_ldconfig(struct pakfire* pakfire); #endif diff --git a/src/libpakfire/include/pakfire/file.h b/src/libpakfire/include/pakfire/file.h index a231130ce..ee2e5caad 100644 --- a/src/libpakfire/include/pakfire/file.h +++ b/src/libpakfire/include/pakfire/file.h @@ -25,11 +25,11 @@ #include #include -#include - struct pakfire_file; -int pakfire_file_create(struct pakfire_file** file, Pakfire pakfire); +#include + +int pakfire_file_create(struct pakfire_file** file, struct pakfire* pakfire); struct pakfire_file* pakfire_file_ref(struct pakfire_file* file); struct pakfire_file* pakfire_file_unref(struct pakfire_file* file); @@ -67,7 +67,7 @@ struct pakfire_file* pakfire_file_parse_from_file(const char* list, unsigned int #include -int pakfire_file_create_from_archive_entry(struct pakfire_file** file, Pakfire pakfire, +int pakfire_file_create_from_archive_entry(struct pakfire_file** file, struct pakfire* pakfire, 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); diff --git a/src/libpakfire/include/pakfire/filelist.h b/src/libpakfire/include/pakfire/filelist.h index 22817eb48..335bb5951 100644 --- a/src/libpakfire/include/pakfire/filelist.h +++ b/src/libpakfire/include/pakfire/filelist.h @@ -24,9 +24,8 @@ struct pakfire_filelist; #include -#include -int pakfire_filelist_create(struct pakfire_filelist** list, Pakfire pakfire); +int pakfire_filelist_create(struct pakfire_filelist** list, struct pakfire* pakfire); struct pakfire_filelist* pakfire_filelist_ref(struct pakfire_filelist* list); struct pakfire_filelist* pakfire_filelist_unref(struct pakfire_filelist* list); @@ -44,7 +43,7 @@ void pakfire_filelist_sort(struct pakfire_filelist* list); #include -int pakfire_filelist_create_from_file(struct pakfire_filelist** list, Pakfire pakfire, +int pakfire_filelist_create_from_file(struct pakfire_filelist** list, struct pakfire* pakfire, char* data, unsigned int format); int pakfire_filelist_scan(struct pakfire_filelist* list, const char* root, diff --git a/src/libpakfire/include/pakfire/key.h b/src/libpakfire/include/pakfire/key.h index 533036d65..f7f993078 100644 --- a/src/libpakfire/include/pakfire/key.h +++ b/src/libpakfire/include/pakfire/key.h @@ -25,7 +25,7 @@ struct pakfire_key; -#include +#include typedef enum pakfire_key_export_mode { PAKFIRE_KEY_EXPORT_MODE_PUBLIC = 0, @@ -35,10 +35,10 @@ typedef enum pakfire_key_export_mode { struct pakfire_key* pakfire_key_ref(struct pakfire_key* key); void pakfire_key_unref(struct pakfire_key* key); -int pakfire_key_fetch(struct pakfire_key** key, Pakfire pakfire, +int pakfire_key_fetch(struct pakfire_key** key, struct pakfire* pakfire, const char* uid, const char* fingerprint); -struct pakfire_key* pakfire_key_get(Pakfire pakfire, const char* fingerprint); +struct pakfire_key* pakfire_key_get(struct pakfire* pakfire, const char* fingerprint); int pakfire_key_delete(struct pakfire_key* key); // Access key properties @@ -52,10 +52,10 @@ time_t pakfire_key_get_created(struct pakfire_key* key); time_t pakfire_key_get_expires(struct pakfire_key* key); int pakfire_key_is_revoked(struct pakfire_key* key); -int pakfire_key_generate(struct pakfire_key** key, Pakfire pakfire, +int pakfire_key_generate(struct pakfire_key** key, struct pakfire* pakfire, const char* algo, const char* userid); int pakfire_key_export(struct pakfire_key* key, FILE* f, pakfire_key_export_mode_t mode); -int pakfire_key_import(Pakfire pakfire, FILE* f, struct pakfire_key*** keys); +int pakfire_key_import(struct pakfire* pakfire, FILE* f, struct pakfire_key*** keys); char* pakfire_key_dump(struct pakfire_key* key); @@ -63,7 +63,7 @@ char* pakfire_key_dump(struct pakfire_key* key); #include -int pakfire_key_create(struct pakfire_key** key, Pakfire pakfire, gpgme_key_t gpgkey); +int pakfire_key_create(struct pakfire_key** key, struct pakfire* pakfire, gpgme_key_t gpgkey); #endif diff --git a/src/libpakfire/include/pakfire/logging.h b/src/libpakfire/include/pakfire/logging.h index 4a156c970..a4357f44a 100644 --- a/src/libpakfire/include/pakfire/logging.h +++ b/src/libpakfire/include/pakfire/logging.h @@ -24,7 +24,6 @@ #include #include -#include void pakfire_log_stderr(void* data, int priority, const char* file, int line, const char* fn, const char* format, va_list args); @@ -35,7 +34,7 @@ void pakfire_log_syslog(void* data, int priority, const char* file, // This function does absolutely nothing static inline void __attribute__((always_inline, format(printf, 2, 3))) - pakfire_log_null(Pakfire pakfire, const char *format, ...) {} + pakfire_log_null(struct pakfire* pakfire, const char *format, ...) {} #define pakfire_log_condition(pakfire, prio, arg...) \ do { \ diff --git a/src/libpakfire/include/pakfire/package.h b/src/libpakfire/include/pakfire/package.h index e88553b51..bee1a2016 100644 --- a/src/libpakfire/include/pakfire/package.h +++ b/src/libpakfire/include/pakfire/package.h @@ -25,17 +25,17 @@ #include #include +#include #include -#include struct pakfire_package; -struct pakfire_package* pakfire_package_create(Pakfire pakfire, struct pakfire_repo* repo, +struct pakfire_package* pakfire_package_create(struct pakfire* pakfire, struct pakfire_repo* repo, const char* name, const char* evr, const char* arch); struct pakfire_package* pakfire_package_ref(struct pakfire_package* pkg); struct pakfire_package* pakfire_package_unref(struct pakfire_package* pkg); -Pakfire pakfire_package_get_pakfire(struct pakfire_package* pkg); +struct pakfire* pakfire_package_get_pakfire(struct pakfire_package* pkg); int pakfire_package_eq(struct pakfire_package* pkg1, struct pakfire_package* pkg2); int pakfire_package_cmp(struct pakfire_package* pkg1, struct pakfire_package* pkg2); @@ -116,10 +116,12 @@ enum pakfire_package_dump_flags { #ifdef PAKFIRE_PRIVATE +#include + #include #include -struct pakfire_package* pakfire_package_create_from_solvable(Pakfire pakfire, Id id); +struct pakfire_package* pakfire_package_create_from_solvable(struct pakfire* pakfire, Id id); void pakfire_package_set_build_id_from_uuid(struct pakfire_package* pkg, uuid_t* build_id); uint64_t pakfire_package_get_dbid(struct pakfire_package* pkg); diff --git a/src/libpakfire/include/pakfire/packagelist.h b/src/libpakfire/include/pakfire/packagelist.h index 68c002911..a3e88cb68 100644 --- a/src/libpakfire/include/pakfire/packagelist.h +++ b/src/libpakfire/include/pakfire/packagelist.h @@ -21,12 +21,12 @@ #ifndef PAKFIRE_PACKAGELIST_H #define PAKFIRE_PACKAGELIST_H -#include -#include - struct pakfire_packagelist; -int pakfire_packagelist_create(struct pakfire_packagelist** list, Pakfire pakfire); +#include +#include + +int pakfire_packagelist_create(struct pakfire_packagelist** list, struct pakfire* pakfire); struct pakfire_packagelist* pakfire_packagelist_ref(struct pakfire_packagelist* list); struct pakfire_packagelist* pakfire_packagelist_unref(struct pakfire_packagelist* list); @@ -40,7 +40,7 @@ void pakfire_packagelist_push(struct pakfire_packagelist* list, struct pakfire_p #include -int pakfire_packagelist_create_from_queue(struct pakfire_packagelist** list, Pakfire pakfire, Queue* q); +int pakfire_packagelist_create_from_queue(struct pakfire_packagelist** list, struct pakfire* pakfire, Queue* q); #endif diff --git a/src/libpakfire/include/pakfire/packager.h b/src/libpakfire/include/pakfire/packager.h index add30c5dd..611fc190f 100644 --- a/src/libpakfire/include/pakfire/packager.h +++ b/src/libpakfire/include/pakfire/packager.h @@ -25,7 +25,6 @@ #include #include -#include struct pakfire_packager; diff --git a/src/libpakfire/include/pakfire/pakfire.h b/src/libpakfire/include/pakfire/pakfire.h index 88e74031b..c59be87cc 100644 --- a/src/libpakfire/include/pakfire/pakfire.h +++ b/src/libpakfire/include/pakfire/pakfire.h @@ -27,11 +27,13 @@ #include #include +struct pakfire; + #include +#include #include #include #include -#include enum pakfire_flags { PAKFIRE_FLAGS_OFFLINE = (1 << 0), @@ -45,34 +47,34 @@ enum pakfire_flags { typedef void (*pakfire_log_function_t)(void* data, int priority, const char* file, int line, const char* fn, const char* format, va_list args); -int pakfire_create(Pakfire* pakfire, const char* path, const char* arch, +int pakfire_create(struct pakfire** pakfire, const char* path, const char* arch, const char* conf, int flags, pakfire_log_function_t log, void* data); -Pakfire pakfire_ref(Pakfire pakfire); -Pakfire pakfire_unref(Pakfire pakfire); +struct pakfire* pakfire_ref(struct pakfire* pakfire); +struct pakfire* pakfire_unref(struct pakfire* pakfire); -const char* pakfire_get_path(Pakfire pakfire); +const char* pakfire_get_path(struct pakfire* pakfire); -int pakfire_clean(Pakfire pakfire, int flags); -int pakfire_refresh(Pakfire pakfire, int flags); +int pakfire_clean(struct pakfire* pakfire, int flags); +int pakfire_refresh(struct pakfire* pakfire, int flags); -int pakfire_bind(Pakfire pakfire, const char* src, const char* dst, int flags); +int pakfire_bind(struct pakfire* pakfire, const char* src, const char* dst, int flags); -int pakfire_list_keys(Pakfire pakfire, struct pakfire_key*** keys); +int pakfire_list_keys(struct pakfire* pakfire, struct pakfire_key*** keys); -int pakfire_copy_in(Pakfire pakfire, const char* src, const char* dst); -int pakfire_copy_out(Pakfire pakfire, const char* src, const char* dst); +int pakfire_copy_in(struct pakfire* pakfire, const char* src, const char* dst); +int pakfire_copy_out(struct pakfire* pakfire, const char* src, const char* dst); -const char* pakfire_get_arch(Pakfire pakfire); +const char* pakfire_get_arch(struct pakfire* pakfire); -int pakfire_version_compare(Pakfire pakfire, const char* evr1, const char* evr2); +int pakfire_version_compare(struct pakfire* pakfire, const char* evr1, const char* evr2); -struct pakfire_repolist* pakfire_get_repos(Pakfire pakfire); -struct pakfire_repo* pakfire_get_repo(Pakfire pakfire, const char* name); +struct pakfire_repolist* pakfire_get_repos(struct pakfire* pakfire); +struct pakfire_repo* pakfire_get_repo(struct pakfire* pakfire, const char* name); -int pakfire_whatprovides(Pakfire pakfire, const char* what, int flags, +int pakfire_whatprovides(struct pakfire* pakfire, const char* what, int flags, struct pakfire_packagelist** list); -int pakfire_whatrequires(Pakfire pakfire, const char* what, int flags, +int pakfire_whatrequires(struct pakfire* pakfire, const char* what, int flags, struct pakfire_packagelist** list); // Search @@ -81,30 +83,30 @@ enum pakfire_search_flags { PAKFIRE_SEARCH_NAME_ONLY = (1 << 0), }; -int pakfire_search(Pakfire pakfire, const char* what, int flags, +int pakfire_search(struct pakfire* pakfire, const char* what, int flags, struct pakfire_packagelist** list); // Logging -int pakfire_log_get_priority(Pakfire pakfire); -void pakfire_log_set_priority(Pakfire pakfire, int priority); +int pakfire_log_get_priority(struct pakfire* pakfire); +void pakfire_log_set_priority(struct pakfire* pakfire, int priority); // Install/Erase/Update -int pakfire_install(Pakfire pakfire, int solver_flags, const char** packages, +int pakfire_install(struct pakfire* pakfire, int solver_flags, const char** packages, const char** locks, int job_flags, int* changed); -int pakfire_erase(Pakfire pakfire, int solver_flags, const char** packages, +int pakfire_erase(struct pakfire* pakfire, int solver_flags, const char** packages, const char** locks, int job_flags, int* changed); -int pakfire_update(Pakfire pakfire, int solver_flags, const char** packages, +int pakfire_update(struct pakfire* pakfire, int solver_flags, const char** packages, const char** locks, int jobs_flags, int* changed); // Check -int pakfire_check(Pakfire pakfire); +int pakfire_check(struct pakfire* pakfire); // Sync -int pakfire_sync(Pakfire pakfire, int solver_flags, int flags, int* changed); +int pakfire_sync(struct pakfire* pakfire, int solver_flags, int flags, int* changed); #ifdef PAKFIRE_PRIVATE @@ -113,45 +115,45 @@ int pakfire_sync(Pakfire pakfire, int solver_flags, int flags, int* changed); #include -int pakfire_on_root(Pakfire pakfire); +int pakfire_on_root(struct pakfire* pakfire); -void pakfire_log(Pakfire pakfire, int priority, const char *file, +void pakfire_log(struct pakfire* pakfire, int priority, const char *file, int line, const char *fn, const char *format, ...) __attribute__((format(printf, 6, 7))); -int pakfire_has_flag(Pakfire pakfire, int flag); +int pakfire_has_flag(struct pakfire* pakfire, int flag); -struct pakfire_config* pakfire_get_config(Pakfire pakfire); -int pakfire_is_mountpoint(Pakfire pakfire, const char* path); +struct pakfire_config* pakfire_get_config(struct pakfire* pakfire); +int pakfire_is_mountpoint(struct pakfire* pakfire, const char* path); -gpgme_ctx_t pakfire_get_gpgctx(Pakfire pakfire); +gpgme_ctx_t pakfire_get_gpgctx(struct pakfire* pakfire); -const char* pakfire_get_distro_name(Pakfire pakfire); -const char* pakfire_get_distro_id(Pakfire pakfire); -const char* pakfire_get_distro_vendor(Pakfire pakfire); -const char* pakfire_get_distro_version(Pakfire pakfire); -const char* pakfire_get_distro_version_id(Pakfire pakfire); +const char* pakfire_get_distro_name(struct pakfire* pakfire); +const char* pakfire_get_distro_id(struct pakfire* pakfire); +const char* pakfire_get_distro_vendor(struct pakfire* pakfire); +const char* pakfire_get_distro_version(struct pakfire* pakfire); +const char* pakfire_get_distro_version_id(struct pakfire* pakfire); #define pakfire_make_path(pakfire, dst, path) \ __pakfire_make_path(pakfire, dst, sizeof(dst) - 1, path) -int __pakfire_make_path(Pakfire pakfire, char* dst, size_t length, const char* path); +int __pakfire_make_path(struct pakfire* pakfire, char* dst, size_t length, const char* path); #define pakfire_make_cache_path(pakfire, path, format, ...) \ __pakfire_make_cache_path(pakfire, path, sizeof(path) - 1, format, __VA_ARGS__) -int __pakfire_make_cache_path(Pakfire pakfire, char* path, size_t length, +int __pakfire_make_cache_path(struct pakfire* pakfire, char* path, size_t length, const char* format, ...) __attribute__((format(printf, 4, 5))); -void pakfire_pool_has_changed(Pakfire pakfire); -void pakfire_pool_apply_changes(Pakfire pakfire); +void pakfire_pool_has_changed(struct pakfire* pakfire); +void pakfire_pool_apply_changes(struct pakfire* pakfire); -Pool* pakfire_get_solv_pool(Pakfire pakfire); +Pool* pakfire_get_solv_pool(struct pakfire* pakfire); -struct pakfire_repo* pakfire_get_installed_repo(Pakfire pakfire); +struct pakfire_repo* pakfire_get_installed_repo(struct pakfire* pakfire); // Archive helpers -struct archive* pakfire_make_archive_disk_reader(Pakfire pakfire, int internal); -struct archive* pakfire_make_archive_disk_writer(Pakfire pakfire); +struct archive* pakfire_make_archive_disk_reader(struct pakfire* pakfire, int internal); +struct archive* pakfire_make_archive_disk_writer(struct pakfire* pakfire); #endif diff --git a/src/libpakfire/include/pakfire/parser.h b/src/libpakfire/include/pakfire/parser.h index d33616659..dbfc632a3 100644 --- a/src/libpakfire/include/pakfire/parser.h +++ b/src/libpakfire/include/pakfire/parser.h @@ -31,7 +31,6 @@ struct pakfire_parser; #include #include #include -#include enum pakfire_parser_flags { PAKFIRE_PARSER_FLAGS_NONE = 0, @@ -40,7 +39,7 @@ enum pakfire_parser_flags { struct pakfire_parser_error; -struct pakfire_parser* pakfire_parser_create(Pakfire pakfire, struct pakfire_parser* parser, +struct pakfire_parser* pakfire_parser_create(struct pakfire* pakfire, struct pakfire_parser* parser, const char* namespace, int flags); struct pakfire_parser* pakfire_parser_create_child(struct pakfire_parser* parser, const char* namespace); @@ -84,7 +83,7 @@ const char* pakfire_parser_error_get_filename(struct pakfire_parser_error* error int pakfire_parser_error_get_line(struct pakfire_parser_error* error); const char* pakfire_parser_error_get_message(struct pakfire_parser_error* error); -Pakfire pakfire_parser_get_pakfire(struct pakfire_parser* parser); +struct pakfire* pakfire_parser_get_pakfire(struct pakfire_parser* parser); struct pakfire_parser_declaration { char namespace[NAME_MAX]; diff --git a/src/libpakfire/include/pakfire/problem.h b/src/libpakfire/include/pakfire/problem.h index 1f880b457..aec5151f7 100644 --- a/src/libpakfire/include/pakfire/problem.h +++ b/src/libpakfire/include/pakfire/problem.h @@ -24,7 +24,6 @@ struct pakfire_problem; #include -#include struct pakfire_problem* pakfire_problem_ref(struct pakfire_problem* problem); struct pakfire_problem* pakfire_problem_unref(struct pakfire_problem* problem); @@ -37,14 +36,13 @@ int pakfire_problem_get_solutions(struct pakfire_problem* problem, #ifdef PAKFIRE_PRIVATE -#include #include -int pakfire_problem_create(struct pakfire_problem** problem, Pakfire pakfire, +int pakfire_problem_create(struct pakfire_problem** problem, struct pakfire* pakfire, struct pakfire_request* request, Id id); -Pakfire pakfire_problem_get_pakfire(struct pakfire_problem* problem); +struct pakfire* pakfire_problem_get_pakfire(struct pakfire_problem* problem); Id pakfire_problem_get_id(struct pakfire_problem* problem); #endif diff --git a/src/libpakfire/include/pakfire/pwd.h b/src/libpakfire/include/pakfire/pwd.h index fc04a52d8..de9e729e8 100644 --- a/src/libpakfire/include/pakfire/pwd.h +++ b/src/libpakfire/include/pakfire/pwd.h @@ -26,13 +26,12 @@ #include #include -#include -struct passwd* pakfire_getpwnam(Pakfire pakfire, const char* name); -struct passwd* pakfire_getpwuid(Pakfire pakfire, uid_t uid); +struct passwd* pakfire_getpwnam(struct pakfire* pakfire, const char* name); +struct passwd* pakfire_getpwuid(struct pakfire* pakfire, uid_t uid); -struct group* pakfire_getgrnam(Pakfire pakfire, const char* name); -struct group* pakfire_getgrgid(Pakfire pakfire, gid_t gid); +struct group* pakfire_getgrnam(struct pakfire* pakfire, const char* name); +struct group* pakfire_getgrgid(struct pakfire* pakfire, gid_t gid); #endif diff --git a/src/libpakfire/include/pakfire/repo.h b/src/libpakfire/include/pakfire/repo.h index 764f49336..d9b31aab1 100644 --- a/src/libpakfire/include/pakfire/repo.h +++ b/src/libpakfire/include/pakfire/repo.h @@ -29,13 +29,12 @@ struct pakfire_repo; #include #include -#include -struct pakfire_repo* pakfire_repo_create(Pakfire pakfire, const char* name); +struct pakfire_repo* pakfire_repo_create(struct pakfire* pakfire, const char* name); struct pakfire_repo* pakfire_repo_ref(struct pakfire_repo* repo); struct pakfire_repo* pakfire_repo_unref(struct pakfire_repo* repo); -Pakfire pakfire_repo_get_pakfire(struct pakfire_repo* repo); +struct pakfire* pakfire_repo_get_pakfire(struct pakfire_repo* repo); int pakfire_repo_clear(struct pakfire_repo* repo); @@ -96,14 +95,14 @@ int pakfire_repo_refresh(struct pakfire_repo* repo, int force); #include #include -int pakfire_repo_import(Pakfire pakfire, struct pakfire_config* config); +int pakfire_repo_import(struct pakfire* pakfire, struct pakfire_config* config); const char* pakfire_repo_get_path(struct pakfire_repo* repo); void pakfire_repo_internalize(struct pakfire_repo* repo); Id pakfire_repo_add_solvable(struct pakfire_repo* repo); -struct pakfire_repo* pakfire_repo_create_from_repo(Pakfire pakfire, Repo* r); -void pakfire_repo_free_all(Pakfire pakfire); +struct pakfire_repo* pakfire_repo_create_from_repo(struct pakfire* pakfire, Repo* r); +void pakfire_repo_free_all(struct pakfire* pakfire); Repo* pakfire_repo_get_repo(struct pakfire_repo* repo); Repodata* pakfire_repo_get_repodata(struct pakfire_repo* repo); diff --git a/src/libpakfire/include/pakfire/repolist.h b/src/libpakfire/include/pakfire/repolist.h index 3f47b60aa..3adb22430 100644 --- a/src/libpakfire/include/pakfire/repolist.h +++ b/src/libpakfire/include/pakfire/repolist.h @@ -22,7 +22,6 @@ #define PAKFIRE_REPOLIST_H #include -#include struct pakfire_repolist; diff --git a/src/libpakfire/include/pakfire/request.h b/src/libpakfire/include/pakfire/request.h index b7b35eef9..02f95afce 100644 --- a/src/libpakfire/include/pakfire/request.h +++ b/src/libpakfire/include/pakfire/request.h @@ -27,7 +27,6 @@ struct pakfire_request; #include #include #include -#include enum pakfire_request_flags { PAKFIRE_REQUEST_WITHOUT_RECOMMENDED = 1 << 0, @@ -40,7 +39,7 @@ enum pakfire_request_job_flags { PAKFIRE_REQUEST_KEEP_ORPHANED = 1 << 1, }; -int pakfire_request_create(struct pakfire_request** request, Pakfire pakfire, int flags); +int pakfire_request_create(struct pakfire_request** request, struct pakfire* pakfire, int flags); struct pakfire_request* pakfire_request_ref(struct pakfire_request* request); struct pakfire_request* pakfire_request_unref(struct pakfire_request* request); diff --git a/src/libpakfire/include/pakfire/scriptlet.h b/src/libpakfire/include/pakfire/scriptlet.h index f729b7ebb..6a083eba9 100644 --- a/src/libpakfire/include/pakfire/scriptlet.h +++ b/src/libpakfire/include/pakfire/scriptlet.h @@ -25,13 +25,12 @@ #ifdef PAKFIRE_PRIVATE -#include extern const char* pakfire_scriptlet_types[13]; struct pakfire_scriptlet; -int pakfire_scriptlet_create(struct pakfire_scriptlet** scriptlet, Pakfire pakfire, +int pakfire_scriptlet_create(struct pakfire_scriptlet** scriptlet, struct pakfire* pakfire, const char* type, const char* data, size_t size); struct pakfire_scriptlet* pakfire_scriptlet_ref(struct pakfire_scriptlet* scriptlet); struct pakfire_scriptlet* pakfire_scriptlet_unref(struct pakfire_scriptlet* scriptlet); diff --git a/src/libpakfire/include/pakfire/snapshot.h b/src/libpakfire/include/pakfire/snapshot.h index 66c806db1..24e96be36 100644 --- a/src/libpakfire/include/pakfire/snapshot.h +++ b/src/libpakfire/include/pakfire/snapshot.h @@ -25,10 +25,9 @@ #include -#include -int pakfire_snapshot_create(Pakfire pakfire, FILE* f); -int pakfire_snapshot_restore(Pakfire pakfire, FILE* f); +int pakfire_snapshot_create(struct pakfire* pakfire, FILE* f); +int pakfire_snapshot_restore(struct pakfire* pakfire, FILE* f); #endif diff --git a/src/libpakfire/include/pakfire/solution.h b/src/libpakfire/include/pakfire/solution.h index f283f7037..59af326c2 100644 --- a/src/libpakfire/include/pakfire/solution.h +++ b/src/libpakfire/include/pakfire/solution.h @@ -32,7 +32,6 @@ const char* pakfire_solution_to_string(struct pakfire_solution* solution); #ifdef PAKFIRE_PRIVATE -#include int pakfire_solution_create(struct pakfire_solution** solution, struct pakfire_problem* problem, Id id); diff --git a/src/libpakfire/include/pakfire/transaction.h b/src/libpakfire/include/pakfire/transaction.h index d422848e9..e5bbf7502 100644 --- a/src/libpakfire/include/pakfire/transaction.h +++ b/src/libpakfire/include/pakfire/transaction.h @@ -37,10 +37,9 @@ int pakfire_transaction_download(struct pakfire_transaction* transaction); #include -#include int pakfire_transaction_create(struct pakfire_transaction** transaction, - Pakfire pakfire, Solver* solver); + struct pakfire* pakfire, Solver* solver); #endif diff --git a/src/libpakfire/include/pakfire/types.h b/src/libpakfire/include/pakfire/types.h deleted file mode 100644 index b73cd8569..000000000 --- a/src/libpakfire/include/pakfire/types.h +++ /dev/null @@ -1,26 +0,0 @@ -/*############################################################################# -# # -# Pakfire - The IPFire package management system # -# Copyright (C) 2013 Pakfire development team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -#############################################################################*/ - -#ifndef PAKFIRE_TYPES_H -#define PAKFIRE_TYPES_H - -typedef struct _Pakfire* Pakfire; - -#endif /* PAKFIRE_TYPES_H */ diff --git a/src/libpakfire/include/pakfire/ui.h b/src/libpakfire/include/pakfire/ui.h index 6d1bed672..c4ad3ff30 100644 --- a/src/libpakfire/include/pakfire/ui.h +++ b/src/libpakfire/include/pakfire/ui.h @@ -25,11 +25,10 @@ #include #include -#include -int pakfire_ui_confirm(Pakfire pakfire, const char* message, const char* question); +int pakfire_ui_confirm(struct pakfire* pakfire, const char* message, const char* question); -int pakfire_ui_pick_solution(Pakfire pakfire, struct pakfire_request* request, +int pakfire_ui_pick_solution(struct pakfire* pakfire, struct pakfire_request* request, struct pakfire_problem** problems); #endif diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h index 4d78f5b2f..26ec35b66 100644 --- a/src/libpakfire/include/pakfire/util.h +++ b/src/libpakfire/include/pakfire/util.h @@ -28,13 +28,11 @@ #include -#include #include -#include -Id pakfire_parse_dep(Pakfire pakfire, const char* s); -void pakfire_parse_deps(Pakfire pakfire, struct pakfire_package* pkg, +Id pakfire_parse_dep(struct pakfire* pakfire, const char* s); +void pakfire_parse_deps(struct pakfire* pakfire, struct pakfire_package* pkg, void (*func)(struct pakfire_package* pkg, const char* dep), const char* deps); #define pakfire_string_format(s, fmt, ...) snprintf(s, sizeof(s) - 1, fmt, __VA_ARGS__) @@ -86,12 +84,12 @@ int pakfire_tty_is_noninteractive(void); int pakfire_archive_copy_data(struct archive* src, struct archive* dst, struct archive_entry* entry); -int pakfire_archive_copy_data_to_buffer(Pakfire pakfire, struct archive* a, +int pakfire_archive_copy_data_to_buffer(struct pakfire* pakfire, struct archive* a, struct archive_entry* entry, char** data, size_t* data_size); // JSON Stuff -struct json_object* pakfire_json_parse_from_file(Pakfire pakfire, const char* path); +struct json_object* pakfire_json_parse_from_file(struct pakfire* pakfire, const char* path); // Time Stuff @@ -105,8 +103,8 @@ int timespec_lt(struct timespec* t1, struct timespec* t2); #define PAKFIRE_RLIMIT_NOFILE_MAX (512 * 1024) -int pakfire_rlimit_set(Pakfire pakfire, int limit); -int pakfire_rlimit_reset_nofile(Pakfire pakfire); +int pakfire_rlimit_set(struct pakfire* pakfire, int limit); +int pakfire_rlimit_reset_nofile(struct pakfire* pakfire); #endif diff --git a/src/libpakfire/key.c b/src/libpakfire/key.c index 963671684..765161206 100644 --- a/src/libpakfire/key.c +++ b/src/libpakfire/key.c @@ -35,13 +35,13 @@ #include struct pakfire_key { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; gpgme_key_t gpgkey; }; -int pakfire_key_create(struct pakfire_key** key, Pakfire pakfire, gpgme_key_t gpgkey) { +int pakfire_key_create(struct pakfire_key** key, struct pakfire* pakfire, gpgme_key_t gpgkey) { if (!gpgkey) { errno = EINVAL; return 1; @@ -86,7 +86,7 @@ static int pakfire_key_extract_email(const char* uid, char** email) { return 0; } -static int __pakfire_key_fetch(gpgme_key_t* key, Pakfire pakfire, +static int __pakfire_key_fetch(gpgme_key_t* key, struct pakfire* pakfire, const char* what, gpgme_keylist_mode_t flags) { // Fetch GPGME context gpgme_ctx_t gpgctx = pakfire_get_gpgctx(pakfire); @@ -132,15 +132,15 @@ ERROR: return r; } -static int pakfire_key_fetch_from_wkd(gpgme_key_t* key, Pakfire pakfire, const char* email) { +static int pakfire_key_fetch_from_wkd(gpgme_key_t* key, struct pakfire* pakfire, const char* email) { return __pakfire_key_fetch(key, pakfire, email, GPGME_KEYLIST_MODE_LOCATE); } -static int pakfire_key_fetch_from_keyserver(gpgme_key_t* key, Pakfire pakfire, const char* fpr) { +static int pakfire_key_fetch_from_keyserver(gpgme_key_t* key, struct pakfire* pakfire, const char* fpr) { return __pakfire_key_fetch(key, pakfire, fpr, GPGME_KEYLIST_MODE_EXTERN); } -PAKFIRE_EXPORT int pakfire_key_fetch(struct pakfire_key** key, Pakfire pakfire, +PAKFIRE_EXPORT int pakfire_key_fetch(struct pakfire_key** key, struct pakfire* pakfire, const char* uid, const char* fingerprint) { // At least one (uid or fingerprint) must be set if (!uid && !fingerprint) { @@ -208,7 +208,7 @@ PAKFIRE_EXPORT void pakfire_key_unref(struct pakfire_key* key) { pakfire_key_free(key); } -static int pakfire_find_key(struct pakfire_key** key, Pakfire pakfire, const char* fingerprint) { +static int pakfire_find_key(struct pakfire_key** key, struct pakfire* pakfire, const char* fingerprint) { // Reset key *key = NULL; @@ -240,7 +240,7 @@ static int pakfire_find_key(struct pakfire_key** key, Pakfire pakfire, const cha return 0; } -PAKFIRE_EXPORT struct pakfire_key* pakfire_key_get(Pakfire pakfire, const char* fingerprint) { +PAKFIRE_EXPORT struct pakfire_key* pakfire_key_get(struct pakfire* pakfire, const char* fingerprint) { struct pakfire_key* key = NULL; int r = pakfire_find_key(&key, pakfire, fingerprint); @@ -347,7 +347,7 @@ PAKFIRE_EXPORT int pakfire_key_is_revoked(struct pakfire_key* key) { return 0; } -PAKFIRE_EXPORT int pakfire_key_generate(struct pakfire_key** key, Pakfire pakfire, +PAKFIRE_EXPORT int pakfire_key_generate(struct pakfire_key** key, struct pakfire* pakfire, const char* algo, const char* userid) { // Reset key *key = NULL; @@ -453,7 +453,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_key_import(Pakfire pakfire, FILE* f, +PAKFIRE_EXPORT int pakfire_key_import(struct pakfire* pakfire, FILE* f, struct pakfire_key*** keys) { gpgme_data_t data; int r = 1; diff --git a/src/libpakfire/package.c b/src/libpakfire/package.c index 9d3719e09..258751480 100644 --- a/src/libpakfire/package.c +++ b/src/libpakfire/package.c @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -44,7 +43,7 @@ #include struct pakfire_package { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; // Reference to this package in the SOLV pool @@ -57,14 +56,14 @@ struct pakfire_package { char path[PATH_MAX]; }; -static void pakfire_package_add_self_provides(Pakfire pakfire, struct pakfire_package* pkg, const char* name, const char* evr) { +static void pakfire_package_add_self_provides(struct pakfire* pakfire, struct pakfire_package* pkg, const char* name, const char* evr) { char buffer[1024]; pakfire_string_format(buffer, "%s = %s", name, evr); pakfire_package_add_provides(pkg, buffer); } -struct pakfire_package* pakfire_package_create_from_solvable(Pakfire pakfire, Id id) { +struct pakfire_package* pakfire_package_create_from_solvable(struct pakfire* pakfire, Id id) { struct pakfire_package* pkg = calloc(1, sizeof(*pkg)); if (!pkg) return NULL; @@ -78,7 +77,7 @@ struct pakfire_package* pakfire_package_create_from_solvable(Pakfire pakfire, Id return pkg; } -PAKFIRE_EXPORT struct pakfire_package* pakfire_package_create(Pakfire pakfire, struct pakfire_repo* repo, const char* name, const char* evr, const char* arch) { +PAKFIRE_EXPORT struct pakfire_package* pakfire_package_create(struct pakfire* pakfire, struct pakfire_repo* repo, const char* name, const char* evr, const char* arch) { Id id = pakfire_repo_add_solvable(repo); if (!id) return NULL; @@ -122,7 +121,7 @@ PAKFIRE_EXPORT struct pakfire_package* pakfire_package_unref(struct pakfire_pack return NULL; } -PAKFIRE_EXPORT Pakfire pakfire_package_get_pakfire(struct pakfire_package* pkg) { +PAKFIRE_EXPORT struct pakfire* pakfire_package_get_pakfire(struct pakfire_package* pkg) { return pakfire_ref(pkg->pakfire); } diff --git a/src/libpakfire/packagelist.c b/src/libpakfire/packagelist.c index 4cec1d027..ff89b7c34 100644 --- a/src/libpakfire/packagelist.c +++ b/src/libpakfire/packagelist.c @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -30,13 +29,12 @@ #include #include #include -#include #include #define BLOCK_SIZE 31 struct pakfire_packagelist { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; struct pakfire_package** elements; @@ -55,7 +53,7 @@ static void pakfire_packagelist_free(struct pakfire_packagelist* list) { } PAKFIRE_EXPORT int pakfire_packagelist_create( - struct pakfire_packagelist** list, Pakfire pakfire) { + struct pakfire_packagelist** list, struct pakfire* pakfire) { struct pakfire_packagelist* l = calloc(1, sizeof(*l)); if (!l) return 1; @@ -67,7 +65,7 @@ PAKFIRE_EXPORT int pakfire_packagelist_create( return 0; } -int pakfire_packagelist_create_from_queue(struct pakfire_packagelist** list, Pakfire pakfire, Queue* q) { +int pakfire_packagelist_create_from_queue(struct pakfire_packagelist** list, struct pakfire* pakfire, Queue* q) { // Create a new package list int r = pakfire_packagelist_create(list, pakfire); if (r) diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c index 7f085f415..47506bb11 100644 --- a/src/libpakfire/packager.c +++ b/src/libpakfire/packager.c @@ -37,13 +37,12 @@ #include #include #include -#include #include #define BUFFER_SIZE 64 * 1024 struct pakfire_packager { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; time_t time_created; @@ -64,7 +63,7 @@ struct pakfire_packager { unsigned int num_scriptlets; }; -static int pakfire_packager_create_mtree(Pakfire pakfire, struct archive** mtree, +static int pakfire_packager_create_mtree(struct pakfire* pakfire, struct archive** mtree, FILE** f, const char** fields) { char path[] = PAKFIRE_PRIVATE_DIR "/tmp/.pakfire-mtree.XXXXXX"; int r; diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c index e8043350a..2a7cd6b54 100644 --- a/src/libpakfire/pakfire.c +++ b/src/libpakfire/pakfire.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include @@ -65,7 +64,7 @@ struct mountpoint { char path[PATH_MAX]; }; -struct _Pakfire { +struct pakfire { char path[PATH_MAX]; char cache_path[PATH_MAX]; char arch[ARCH_MAX]; @@ -121,7 +120,7 @@ static const struct pakfire_feature { { NULL }, }; -int pakfire_on_root(Pakfire pakfire) { +int pakfire_on_root(struct pakfire* pakfire) { return (strcmp(pakfire->path, "/") == 0); } @@ -163,7 +162,7 @@ static const struct pakfire_mountpoint { { NULL }, }; -static int __mount(Pakfire pakfire, const char* source, const char* target, +static int __mount(struct pakfire* pakfire, const char* source, const char* target, const char* filesystemtype, unsigned long mountflags, const void* data) { int r = mount(source, target, filesystemtype, mountflags, data); if (r) @@ -185,7 +184,7 @@ static int __mount(Pakfire pakfire, const char* source, const char* target, return 0; } -static int pakfire_mount(Pakfire pakfire) { +static int pakfire_mount(struct pakfire* pakfire) { char target[PATH_MAX]; int r; @@ -223,7 +222,7 @@ RETRY: return 0; } -static int pakfire_umount(Pakfire pakfire) { +static int pakfire_umount(struct pakfire* pakfire) { struct mountpoint* mp; int r; int flags = 0; @@ -260,7 +259,7 @@ RETRY: return 0; } -int pakfire_is_mountpoint(Pakfire pakfire, const char* path) { +int pakfire_is_mountpoint(struct pakfire* pakfire, const char* path) { struct mountpoint* mp; // Check if path is on this list @@ -303,7 +302,7 @@ static const struct pakfire_symlink { { NULL }, }; -static int pakfire_populate_dev(Pakfire pakfire) { +static int pakfire_populate_dev(struct pakfire* pakfire) { char path[PATH_MAX]; // Create device nodes @@ -341,7 +340,7 @@ static int pakfire_populate_dev(Pakfire pakfire) { return 0; } -static void pakfire_log_set_function(Pakfire pakfire, +static void pakfire_log_set_function(struct pakfire* pakfire, pakfire_log_function_t log_function, void* data) { pakfire->log_function = log_function; pakfire->log_data = data; @@ -367,13 +366,13 @@ static int log_priority(const char* priority) { } static void pool_log(Pool* pool, void* data, int type, const char* s) { - Pakfire pakfire = (Pakfire)data; + struct pakfire* pakfire = (struct pakfire*)data; DEBUG(pakfire, "pool: %s", s); } static Id pakfire_namespace_callback(Pool* pool, void* data, Id ns, Id id) { - Pakfire pakfire = (Pakfire)data; + struct pakfire* pakfire = (struct pakfire*)data; const char* namespace = pool_id2str(pool, ns); const char* name = pool_dep2str(pool, id); @@ -394,7 +393,7 @@ static Id pakfire_namespace_callback(Pool* pool, void* data, Id ns, Id id) { return 0; } -static int pakfire_populate_pool(Pakfire pakfire) { +static int pakfire_populate_pool(struct pakfire* pakfire) { struct pakfire_db* db; struct pakfire_repo* repo = NULL; struct pakfire_repo* dummy = NULL; @@ -458,7 +457,7 @@ ERROR: return r; } -static int pakfire_mount_interpreter(Pakfire pakfire) { +static int pakfire_mount_interpreter(struct pakfire* pakfire) { char target[PATH_MAX]; // Can we emulate this architecture? @@ -493,7 +492,7 @@ static int pakfire_mount_interpreter(Pakfire pakfire) { return r; } -static void pakfire_free(Pakfire pakfire) { +static void pakfire_free(struct pakfire* pakfire) { // Release GPGME context if (pakfire->gpgctx) gpgme_release(pakfire->gpgctx); @@ -520,7 +519,7 @@ static void pakfire_free(Pakfire pakfire) { } // Safety check in case this is being launched on the host system -static int pakfire_safety_checks(Pakfire pakfire) { +static int pakfire_safety_checks(struct pakfire* pakfire) { // Nothing to do if we are not working on root if (!pakfire_on_root(pakfire)) return 0; @@ -534,7 +533,7 @@ static int pakfire_safety_checks(Pakfire pakfire) { return 0; } -static int pakfire_read_repo_config(Pakfire pakfire) { +static int pakfire_read_repo_config(struct pakfire* pakfire) { char path[PATH_MAX]; int r = pakfire_make_path(pakfire, path, PAKFIRE_CONFIG_PATH "/repos"); @@ -588,42 +587,42 @@ ERROR: return r; } -const char* pakfire_get_distro_name(Pakfire pakfire) { +const char* pakfire_get_distro_name(struct pakfire* pakfire) { if (*pakfire->distro.name) return pakfire->distro.name; return NULL; } -const char* pakfire_get_distro_id(Pakfire pakfire) { +const char* pakfire_get_distro_id(struct pakfire* pakfire) { if (*pakfire->distro.id) return pakfire->distro.id; return NULL; } -const char* pakfire_get_distro_vendor(Pakfire pakfire) { +const char* pakfire_get_distro_vendor(struct pakfire* pakfire) { if (*pakfire->distro.vendor) return pakfire->distro.vendor; return NULL; } -const char* pakfire_get_distro_version(Pakfire pakfire) { +const char* pakfire_get_distro_version(struct pakfire* pakfire) { if (*pakfire->distro.version) return pakfire->distro.version; return NULL; } -const char* pakfire_get_distro_version_id(Pakfire pakfire) { +const char* pakfire_get_distro_version_id(struct pakfire* pakfire) { if (*pakfire->distro.version_id) return pakfire->distro.version_id; return NULL; } -static int pakfire_config_import_distro(Pakfire pakfire) { +static int pakfire_config_import_distro(struct pakfire* pakfire) { // Nothing to do if there is no distro section if (!pakfire_config_has_section(pakfire->config, "distro")) return 0; @@ -672,7 +671,7 @@ static int pakfire_config_import_distro(Pakfire pakfire) { return 0; } -static int pakfire_read_config(Pakfire pakfire, const char* path) { +static int pakfire_read_config(struct pakfire* pakfire, const char* path) { char default_path[PATH_MAX]; // Use default path if none set @@ -719,7 +718,7 @@ ERROR: return r; } -static int pakfire_read_os_release(Pakfire pakfire) { +static int pakfire_read_os_release(struct pakfire* pakfire) { char path[PATH_MAX]; char* line = NULL; size_t l = 0; @@ -797,8 +796,9 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_create(Pakfire* pakfire, const char* path, const char* arch, - const char* conf, int flags, pakfire_log_function_t log, void* data) { +PAKFIRE_EXPORT int pakfire_create(struct pakfire** pakfire, const char* path, + const char* arch, const char* conf, int flags, pakfire_log_function_t log, + void* data) { char tempdir[PATH_MAX] = PAKFIRE_PRIVATE_DIR "/tmp/XXXXXX"; int r = 1; @@ -825,7 +825,7 @@ PAKFIRE_EXPORT int pakfire_create(Pakfire* pakfire, const char* path, const char return 1; } - Pakfire p = calloc(1, sizeof(*p)); + struct pakfire* p = calloc(1, sizeof(*p)); if (!p) return 1; @@ -974,13 +974,13 @@ ERROR: return r; } -PAKFIRE_EXPORT Pakfire pakfire_ref(Pakfire pakfire) { +PAKFIRE_EXPORT struct pakfire* pakfire_ref(struct pakfire* pakfire) { ++pakfire->nrefs; return pakfire; } -PAKFIRE_EXPORT Pakfire pakfire_unref(Pakfire pakfire) { +PAKFIRE_EXPORT struct pakfire* pakfire_unref(struct pakfire* pakfire) { if (--pakfire->nrefs > 0) return pakfire; @@ -989,22 +989,22 @@ PAKFIRE_EXPORT Pakfire pakfire_unref(Pakfire pakfire) { return NULL; } -int pakfire_has_flag(Pakfire pakfire, int flag) { +int pakfire_has_flag(struct pakfire* pakfire, int flag) { return pakfire->flags & flag; } -struct pakfire_config* pakfire_get_config(Pakfire pakfire) { +struct pakfire_config* pakfire_get_config(struct pakfire* pakfire) { if (!pakfire->config) return NULL; return pakfire_config_ref(pakfire->config); } -PAKFIRE_EXPORT const char* pakfire_get_path(Pakfire pakfire) { +PAKFIRE_EXPORT const char* pakfire_get_path(struct pakfire* pakfire) { return pakfire->path; } -int __pakfire_make_path(Pakfire pakfire, char* dst, size_t length, const char* path) { +int __pakfire_make_path(struct pakfire* pakfire, char* dst, size_t length, const char* path) { // Make sure that path never starts with / while (path && *path == '/') path++; @@ -1012,7 +1012,7 @@ int __pakfire_make_path(Pakfire pakfire, char* dst, size_t length, const char* p return __pakfire_path_join(dst, length, pakfire->path, path); } -PAKFIRE_EXPORT int pakfire_bind(Pakfire pakfire, const char* src, const char* dst, int flags) { +PAKFIRE_EXPORT int pakfire_bind(struct pakfire* pakfire, const char* src, const char* dst, int flags) { struct stat st; char mountpoint[PATH_MAX]; @@ -1062,7 +1062,7 @@ PAKFIRE_EXPORT int pakfire_bind(Pakfire pakfire, const char* src, const char* ds return __mount(pakfire, src, mountpoint, NULL, flags|MS_BIND, NULL); } -static int pakfire_init_gpgme(Pakfire pakfire) { +static int pakfire_init_gpgme(struct pakfire* pakfire) { static int gpgme_initialized = 0; // Do nothing if gpgme is already initialized @@ -1086,7 +1086,7 @@ static int pakfire_init_gpgme(Pakfire pakfire) { return 0; } -gpgme_ctx_t pakfire_get_gpgctx(Pakfire pakfire) { +gpgme_ctx_t pakfire_get_gpgctx(struct pakfire* pakfire) { int r = pakfire_init_gpgme(pakfire); if (r) return NULL; @@ -1140,7 +1140,7 @@ ERROR: return NULL; } -PAKFIRE_EXPORT int pakfire_list_keys(Pakfire pakfire, struct pakfire_key*** keys) { +PAKFIRE_EXPORT int pakfire_list_keys(struct pakfire* pakfire, struct pakfire_key*** keys) { // Reset keys *keys = NULL; @@ -1198,7 +1198,7 @@ ERROR: return r; } -static int pakfire_foreach_repo(Pakfire pakfire, +static int pakfire_foreach_repo(struct pakfire* pakfire, int (*func)(struct pakfire_repo* repo, int flags), int flags) { struct pakfire_repo* repo; @@ -1226,11 +1226,11 @@ static int pakfire_foreach_repo(Pakfire pakfire, return 0; } -PAKFIRE_EXPORT int pakfire_clean(Pakfire pakfire, int flags) { +PAKFIRE_EXPORT int pakfire_clean(struct pakfire* pakfire, int flags) { return pakfire_foreach_repo(pakfire, pakfire_repo_clean, flags); } -PAKFIRE_EXPORT int pakfire_refresh(Pakfire pakfire, int flags) { +PAKFIRE_EXPORT int pakfire_refresh(struct pakfire* pakfire, int flags) { // Do nothing if running in offline mode if (pakfire_has_flag(pakfire, PAKFIRE_FLAGS_OFFLINE)) return 0; @@ -1238,7 +1238,7 @@ PAKFIRE_EXPORT int pakfire_refresh(Pakfire pakfire, int flags) { return pakfire_foreach_repo(pakfire, pakfire_repo_refresh, flags); } -static int pakfire_copy(Pakfire pakfire, const char* src, const char* dst) { +static int pakfire_copy(struct pakfire* pakfire, const char* src, const char* dst) { char buffer[512 * 1024]; struct archive* reader = NULL; struct archive* writer = NULL; @@ -1317,7 +1317,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_copy_in(Pakfire pakfire, const char* src, const char* dst) { +PAKFIRE_EXPORT int pakfire_copy_in(struct pakfire* pakfire, const char* src, const char* dst) { if (pakfire_on_root(pakfire)) { errno = ENOTSUP; return 1; @@ -1331,7 +1331,7 @@ PAKFIRE_EXPORT int pakfire_copy_in(Pakfire pakfire, const char* src, const char* return pakfire_copy(pakfire, src, path); } -PAKFIRE_EXPORT int pakfire_copy_out(Pakfire pakfire, const char* src, const char* dst) { +PAKFIRE_EXPORT int pakfire_copy_out(struct pakfire* pakfire, const char* src, const char* dst) { if (pakfire_on_root(pakfire)) { errno = ENOTSUP; return 1; @@ -1345,23 +1345,23 @@ PAKFIRE_EXPORT int pakfire_copy_out(Pakfire pakfire, const char* src, const char return pakfire_copy(pakfire, path, dst); } -PAKFIRE_EXPORT const char* pakfire_get_arch(Pakfire pakfire) { +PAKFIRE_EXPORT const char* pakfire_get_arch(struct pakfire* pakfire) { return pakfire->arch; } -PAKFIRE_EXPORT int pakfire_version_compare(Pakfire pakfire, const char* evr1, const char* evr2) { +PAKFIRE_EXPORT int pakfire_version_compare(struct pakfire* pakfire, const char* evr1, const char* evr2) { return pool_evrcmp_str(pakfire->pool, evr1, evr2, EVRCMP_COMPARE); } -Pool* pakfire_get_solv_pool(Pakfire pakfire) { +Pool* pakfire_get_solv_pool(struct pakfire* pakfire) { return pakfire->pool; } -void pakfire_pool_has_changed(Pakfire pakfire) { +void pakfire_pool_has_changed(struct pakfire* pakfire) { pakfire->pool_ready = 0; } -void pakfire_pool_apply_changes(Pakfire pakfire) { +void pakfire_pool_apply_changes(struct pakfire* pakfire) { if (!pakfire->pool_ready) { pool_addfileprovides(pakfire->pool); pool_createwhatprovides(pakfire->pool); @@ -1369,7 +1369,7 @@ void pakfire_pool_apply_changes(Pakfire pakfire) { } } -PAKFIRE_EXPORT struct pakfire_repolist* pakfire_get_repos(Pakfire pakfire) { +PAKFIRE_EXPORT struct pakfire_repolist* pakfire_get_repos(struct pakfire* pakfire) { struct pakfire_repolist* list; int r = pakfire_repolist_create(&list); @@ -1407,7 +1407,7 @@ ERROR: return NULL; } -PAKFIRE_EXPORT struct pakfire_repo* pakfire_get_repo(Pakfire pakfire, const char* name) { +PAKFIRE_EXPORT struct pakfire_repo* pakfire_get_repo(struct pakfire* pakfire, const char* name) { Pool* pool = pakfire_get_solv_pool(pakfire); Repo* repo; @@ -1422,14 +1422,14 @@ PAKFIRE_EXPORT struct pakfire_repo* pakfire_get_repo(Pakfire pakfire, const char return NULL; } -struct pakfire_repo* pakfire_get_installed_repo(Pakfire pakfire) { +struct pakfire_repo* pakfire_get_installed_repo(struct pakfire* pakfire) { if (!pakfire->pool->installed) return NULL; return pakfire_repo_create_from_repo(pakfire, pakfire->pool->installed); } -static int pakfire_search_dep(Pakfire pakfire, Id type, const char* what, int flags, +static int pakfire_search_dep(struct pakfire* pakfire, Id type, const char* what, int flags, struct pakfire_packagelist** list) { // Refresh repositories int r = pakfire_refresh(pakfire, 0); @@ -1469,17 +1469,17 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_whatprovides(Pakfire pakfire, const char* what, int flags, +PAKFIRE_EXPORT int pakfire_whatprovides(struct pakfire* pakfire, const char* what, int flags, struct pakfire_packagelist** list) { return pakfire_search_dep(pakfire, SOLVABLE_PROVIDES, what, flags, list); } -PAKFIRE_EXPORT int pakfire_whatrequires(Pakfire pakfire, const char* what, int flags, +PAKFIRE_EXPORT int pakfire_whatrequires(struct pakfire* pakfire, const char* what, int flags, struct pakfire_packagelist** list) { return pakfire_search_dep(pakfire, SOLVABLE_REQUIRES, what, flags, list); } -PAKFIRE_EXPORT int pakfire_search(Pakfire pakfire, const char* what, int flags, +PAKFIRE_EXPORT int pakfire_search(struct pakfire* pakfire, const char* what, int flags, struct pakfire_packagelist** list) { Queue matches; Dataiterator di; @@ -1541,7 +1541,7 @@ ERROR: // Cache -int __pakfire_make_cache_path(Pakfire pakfire, char* path, size_t length, +int __pakfire_make_cache_path(struct pakfire* pakfire, char* path, size_t length, const char* format, ...) { va_list args; @@ -1564,15 +1564,15 @@ int __pakfire_make_cache_path(Pakfire pakfire, char* path, size_t length, return 0; } -PAKFIRE_EXPORT int pakfire_log_get_priority(Pakfire pakfire) { +PAKFIRE_EXPORT int pakfire_log_get_priority(struct pakfire* pakfire) { return pakfire->log_priority; } -PAKFIRE_EXPORT void pakfire_log_set_priority(Pakfire pakfire, int priority) { +PAKFIRE_EXPORT void pakfire_log_set_priority(struct pakfire* pakfire, int priority) { pakfire->log_priority = priority; } -void pakfire_log(Pakfire pakfire, int priority, const char* file, int line, +void pakfire_log(struct pakfire* pakfire, int priority, const char* file, int line, const char* fn, const char* format, ...) { va_list args; @@ -1588,7 +1588,7 @@ void pakfire_log(Pakfire pakfire, int priority, const char* file, int line, } static const char* pakfire_user_lookup(void* data, la_int64_t uid) { - Pakfire pakfire = (Pakfire)data; + struct pakfire* pakfire = (struct pakfire*)data; // Fast path for "root" if (uid == 0) @@ -1607,7 +1607,7 @@ static const char* pakfire_user_lookup(void* data, la_int64_t uid) { } static const char* pakfire_group_lookup(void* data, la_int64_t gid) { - Pakfire pakfire = (Pakfire)data; + struct pakfire* pakfire = (struct pakfire*)data; // Fast path for "root" if (gid == 0) @@ -1625,7 +1625,7 @@ static const char* pakfire_group_lookup(void* data, la_int64_t gid) { return entry->gr_name; } -struct archive* pakfire_make_archive_disk_reader(Pakfire pakfire, int internal) { +struct archive* pakfire_make_archive_disk_reader(struct pakfire* pakfire, int internal) { struct archive* archive = archive_read_disk_new(); if (!archive) return NULL; @@ -1651,7 +1651,7 @@ struct archive* pakfire_make_archive_disk_reader(Pakfire pakfire, int internal) } static la_int64_t pakfire_uid_lookup(void* data, const char* name, la_int64_t uid) { - Pakfire pakfire = (Pakfire)data; + struct pakfire* pakfire = (struct pakfire*)data; // Fast path for "root" if (strcmp(name, "root") == 0) @@ -1670,7 +1670,7 @@ static la_int64_t pakfire_uid_lookup(void* data, const char* name, la_int64_t ui } static la_int64_t pakfire_gid_lookup(void* data, const char* name, la_int64_t uid) { - Pakfire pakfire = (Pakfire)data; + struct pakfire* pakfire = (struct pakfire*)data; // Fast path for "root" if (strcmp(name, "root") == 0) @@ -1688,7 +1688,7 @@ static la_int64_t pakfire_gid_lookup(void* data, const char* name, la_int64_t ui return entry->gr_gid; } -struct archive* pakfire_make_archive_disk_writer(Pakfire pakfire) { +struct archive* pakfire_make_archive_disk_writer(struct pakfire* pakfire) { struct archive* archive = archive_write_disk_new(); if (!archive) return NULL; @@ -1714,7 +1714,7 @@ struct archive* pakfire_make_archive_disk_writer(Pakfire pakfire) { // Convenience functions to install/erase/update packages -static int pakfire_perform_transaction(Pakfire pakfire, int solver_flags, +static int pakfire_perform_transaction(struct pakfire* pakfire, int solver_flags, int (*action)(struct pakfire_request* request, const char* what, int flags), const char** packages, const char** locks, int job_flags, int* changed) { struct pakfire_request* request = NULL; @@ -1816,19 +1816,19 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_install(Pakfire pakfire, int solver_flags, +PAKFIRE_EXPORT int pakfire_install(struct pakfire* pakfire, int solver_flags, const char** packages, const char** locks, int flags, int* changed) { return pakfire_perform_transaction(pakfire, solver_flags, pakfire_request_install, packages, locks, flags, changed); } -PAKFIRE_EXPORT int pakfire_erase(Pakfire pakfire, int solver_flags, +PAKFIRE_EXPORT int pakfire_erase(struct pakfire* pakfire, int solver_flags, const char** packages, const char** locks, int flags, int* changed) { return pakfire_perform_transaction(pakfire, solver_flags, pakfire_request_erase, packages, locks, flags, changed); } -static int pakfire_perform_transaction_simple(Pakfire pakfire, int solver_flags, +static int pakfire_perform_transaction_simple(struct pakfire* pakfire, int solver_flags, int (*action)(struct pakfire_request* request, int flags), int job_flags, int* changed) { struct pakfire_request* request = NULL; @@ -1909,7 +1909,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_update(Pakfire pakfire, int solver_flags, +PAKFIRE_EXPORT int pakfire_update(struct pakfire* pakfire, int solver_flags, const char** packages, const char** locks, int flags, int* changed) { // If no packages are being passed, we will try to update everything // XXX add locks @@ -1921,11 +1921,11 @@ PAKFIRE_EXPORT int pakfire_update(Pakfire pakfire, int solver_flags, packages, locks, flags, changed); } -static int pakfire_verify(Pakfire pakfire, int *changed) { +static int pakfire_verify(struct pakfire* pakfire, int *changed) { return pakfire_perform_transaction_simple(pakfire, 0, pakfire_request_verify, 0, changed); } -PAKFIRE_EXPORT int pakfire_check(Pakfire pakfire) { +PAKFIRE_EXPORT int pakfire_check(struct pakfire* pakfire) { struct pakfire_db* db = NULL; int r; @@ -1951,7 +1951,7 @@ ERROR: return r; } -PAKFIRE_EXPORT int pakfire_sync(Pakfire pakfire, int solver_flags, int flags, int* changed) { +PAKFIRE_EXPORT int pakfire_sync(struct pakfire* pakfire, int solver_flags, int flags, int* changed) { return pakfire_perform_transaction_simple(pakfire, solver_flags, pakfire_request_sync, flags, changed); } diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c index 15ab37491..a43a5dd1f 100644 --- a/src/libpakfire/parser.c +++ b/src/libpakfire/parser.c @@ -38,7 +38,7 @@ #include struct pakfire_parser { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; struct pakfire_parser* parent; @@ -103,7 +103,7 @@ static int pakfire_parser_compile_regexes(struct pakfire_parser* parser) { return 0; } -struct pakfire_parser* pakfire_parser_create(Pakfire pakfire, +struct pakfire_parser* pakfire_parser_create(struct pakfire* pakfire, struct pakfire_parser* parent, const char* namespace, int flags) { struct pakfire_parser* parser = calloc(1, sizeof(*parser)); if (parser) { @@ -134,7 +134,7 @@ struct pakfire_parser* pakfire_parser_ref(struct pakfire_parser* parser) { return parser; } -Pakfire pakfire_parser_get_pakfire(struct pakfire_parser* parser) { +struct pakfire* pakfire_parser_get_pakfire(struct pakfire_parser* parser) { return pakfire_ref(parser->pakfire); } diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y index f8801da0d..ff156bf29 100644 --- a/src/libpakfire/parser/grammar.y +++ b/src/libpakfire/parser/grammar.y @@ -22,7 +22,7 @@ %parse-param {yyscan_t* scanner} - {Pakfire pakfire} + {struct pakfire* pakfire} {struct pakfire_parser** parser} {struct pakfire_parser* parent} {struct pakfire_parser_error** error} @@ -42,8 +42,8 @@ #include #include +#include #include -#include #include #define YYERROR_VERBOSE 1 @@ -74,7 +74,7 @@ enum operator { OP_EQUALS = 0, }; -static void yyerror(yyscan_t* scanner, Pakfire pakfire, struct pakfire_parser** parser, +static void yyerror(yyscan_t* scanner, struct pakfire* pakfire, struct pakfire_parser** parser, struct pakfire_parser* parent, struct pakfire_parser_error** error, const char* s) { ERROR(pakfire, "Error (line %d): %s\n", num_lines, s); @@ -87,7 +87,7 @@ static void yyerror(yyscan_t* scanner, Pakfire pakfire, struct pakfire_parser** } } -static struct pakfire_parser* make_if_stmt(Pakfire pakfire, const enum operator op, +static struct pakfire_parser* make_if_stmt(struct pakfire* pakfire, const enum operator op, const char* val1, const char* val2, struct pakfire_parser* if_block, struct pakfire_parser* else_block); static int pakfire_parser_new_declaration( @@ -389,7 +389,7 @@ else_stmt : T_ELSE T_EOL block int pakfire_parser_parse_data(struct pakfire_parser* parent, const char* data, size_t len, struct pakfire_parser_error** error) { - Pakfire pakfire = pakfire_parser_get_pakfire(parent); + struct pakfire* pakfire = pakfire_parser_get_pakfire(parent); yyscan_t scanner; #ifdef ENABLE_DEBUG @@ -446,7 +446,7 @@ int pakfire_parser_parse_data(struct pakfire_parser* parent, const char* data, s return r; } -static struct pakfire_parser* make_if_stmt(Pakfire pakfire, const enum operator op, +static struct pakfire_parser* make_if_stmt(struct pakfire* pakfire, const enum operator op, const char* val1, const char* val2, struct pakfire_parser* if_block, struct pakfire_parser* else_block) { switch (op) { case OP_EQUALS: diff --git a/src/libpakfire/parser/scanner.l b/src/libpakfire/parser/scanner.l index 500cbde68..cf1fbfedc 100644 --- a/src/libpakfire/parser/scanner.l +++ b/src/libpakfire/parser/scanner.l @@ -34,6 +34,7 @@ int num_lines; #include +#include #include #include diff --git a/src/libpakfire/problem.c b/src/libpakfire/problem.c index b68190632..5a9559ba2 100644 --- a/src/libpakfire/problem.c +++ b/src/libpakfire/problem.c @@ -31,7 +31,7 @@ #include struct pakfire_problem { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; struct pakfire_request* request; @@ -183,7 +183,7 @@ static char* pakfire_problem_make_string(struct pakfire_problem* problem) { } PAKFIRE_EXPORT int pakfire_problem_create(struct pakfire_problem** problem, - Pakfire pakfire, struct pakfire_request* request, Id id) { + struct pakfire* pakfire, struct pakfire_request* request, Id id) { struct pakfire_problem* p = calloc(1, sizeof(*p)); if (!p) return 1; @@ -222,7 +222,7 @@ PAKFIRE_EXPORT struct pakfire_problem* pakfire_problem_unref(struct pakfire_prob return NULL; } -Pakfire pakfire_problem_get_pakfire(struct pakfire_problem* problem) { +struct pakfire* pakfire_problem_get_pakfire(struct pakfire_problem* problem) { return pakfire_ref(problem->pakfire); } diff --git a/src/libpakfire/pwd.c b/src/libpakfire/pwd.c index 0e25bbe54..c05d2a823 100644 --- a/src/libpakfire/pwd.c +++ b/src/libpakfire/pwd.c @@ -27,7 +27,7 @@ #include #include -static struct passwd* pakfire_getpwent(Pakfire pakfire, +static struct passwd* pakfire_getpwent(struct pakfire* pakfire, int(*cmp)(struct passwd* entry, const void* value), const void* value) { struct passwd* entry = NULL; char path[PATH_MAX]; @@ -70,7 +70,7 @@ static int __pakfire_getpwnam(struct passwd* entry, const void* value) { return 0; } -struct passwd* pakfire_getpwnam(Pakfire pakfire, const char* name) { +struct passwd* pakfire_getpwnam(struct pakfire* pakfire, const char* name) { return pakfire_getpwent(pakfire, __pakfire_getpwnam, name); } @@ -83,11 +83,11 @@ static int __pakfire_getpwuid(struct passwd* entry, const void* value) { return 0; } -struct passwd* pakfire_getpwuid(Pakfire pakfire, uid_t uid) { +struct passwd* pakfire_getpwuid(struct pakfire* pakfire, uid_t uid) { return pakfire_getpwent(pakfire, __pakfire_getpwuid, &uid); } -static struct group* pakfire_getgrent(Pakfire pakfire, +static struct group* pakfire_getgrent(struct pakfire* pakfire, int(*cmp)(struct group* entry, const void* value), const void* value) { struct group* entry = NULL; char path[PATH_MAX]; @@ -130,7 +130,7 @@ static int __pakfire_getgrnam(struct group* entry, const void* value) { return 0; } -struct group* pakfire_getgrnam(Pakfire pakfire, const char* name) { +struct group* pakfire_getgrnam(struct pakfire* pakfire, const char* name) { return pakfire_getgrent(pakfire, __pakfire_getgrnam, name); } @@ -143,6 +143,6 @@ static int __pakfire_getgrgid(struct group* entry, const void* value) { return 0; } -struct group* pakfire_getgrgid(Pakfire pakfire, gid_t gid) { +struct group* pakfire_getgrgid(struct pakfire* pakfire, gid_t gid) { return pakfire_getgrent(pakfire, __pakfire_getgrgid, &gid); } diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c index 36beae2e9..c14c4a676 100644 --- a/src/libpakfire/repo.c +++ b/src/libpakfire/repo.c @@ -45,7 +45,6 @@ #include #include #include -#include #include // Refresh mirrorlists once a day @@ -69,7 +68,7 @@ struct pakfire_repo_appdata { }; struct pakfire_repo { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; Repo* repo; @@ -86,7 +85,7 @@ static int pakfire_repo_is_internal(struct pakfire_repo* repo) { return (*name == '@'); } -int pakfire_repo_import(Pakfire pakfire, struct pakfire_config* config) { +int pakfire_repo_import(struct pakfire* pakfire, struct pakfire_config* config) { char** sections = pakfire_config_sections(config); // The configuration seems to be empty @@ -363,7 +362,7 @@ static void pakfire_repo_free(struct pakfire_repo* repo, const int free_repo) { free(repo); } -void pakfire_repo_free_all(Pakfire pakfire) { +void pakfire_repo_free_all(struct pakfire* pakfire) { Pool* pool = pakfire_get_solv_pool(pakfire); if (!pool) return; @@ -377,7 +376,7 @@ void pakfire_repo_free_all(Pakfire pakfire) { } } -PAKFIRE_EXPORT struct pakfire_repo* pakfire_repo_create(Pakfire pakfire, const char* name) { +PAKFIRE_EXPORT struct pakfire_repo* pakfire_repo_create(struct pakfire* pakfire, const char* name) { struct pakfire_repo* repo; int r; @@ -446,7 +445,7 @@ ERROR: return NULL; } -struct pakfire_repo* pakfire_repo_create_from_repo(Pakfire pakfire, Repo* r) { +struct pakfire_repo* pakfire_repo_create_from_repo(struct pakfire* pakfire, Repo* r) { struct pakfire_repo* repo = calloc(1, sizeof(*repo)); if (repo) { DEBUG(pakfire, "Allocated Repo at %p\n", repo); @@ -477,7 +476,7 @@ PAKFIRE_EXPORT struct pakfire_repo* pakfire_repo_unref(struct pakfire_repo* repo return NULL; } -PAKFIRE_EXPORT Pakfire pakfire_repo_get_pakfire(struct pakfire_repo* repo) { +PAKFIRE_EXPORT struct pakfire* pakfire_repo_get_pakfire(struct pakfire_repo* repo) { return pakfire_ref(repo->pakfire); } diff --git a/src/libpakfire/repolist.c b/src/libpakfire/repolist.c index 96e417372..f7b36deca 100644 --- a/src/libpakfire/repolist.c +++ b/src/libpakfire/repolist.c @@ -24,7 +24,6 @@ #include #include #include -#include struct pakfire_repolist { int nrefs; diff --git a/src/libpakfire/request.c b/src/libpakfire/request.c index 90ae82a63..bb8bdc7c4 100644 --- a/src/libpakfire/request.c +++ b/src/libpakfire/request.c @@ -41,11 +41,10 @@ #include #include #include -#include #include struct pakfire_request { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; Solver* solver; @@ -133,7 +132,7 @@ static int setup_solver(struct pakfire_request* request, int flags) { } PAKFIRE_EXPORT int pakfire_request_create(struct pakfire_request** request, - Pakfire pakfire, int flags) { + struct pakfire* pakfire, int flags) { Pool* pool = pakfire_get_solv_pool(pakfire); int r = 1; diff --git a/src/libpakfire/scriptlet.c b/src/libpakfire/scriptlet.c index ded8db6ec..1ffa1ff9a 100644 --- a/src/libpakfire/scriptlet.c +++ b/src/libpakfire/scriptlet.c @@ -25,7 +25,6 @@ #include #include #include -#include #include const char* pakfire_scriptlet_types[] = { @@ -45,7 +44,7 @@ const char* pakfire_scriptlet_types[] = { }; struct pakfire_scriptlet { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; // Type @@ -93,7 +92,7 @@ static void pakfire_scriptlet_free(struct pakfire_scriptlet* scriptlet) { free(scriptlet); } -int pakfire_scriptlet_create(struct pakfire_scriptlet** scriptlet, Pakfire pakfire, +int pakfire_scriptlet_create(struct pakfire_scriptlet** scriptlet, struct pakfire* pakfire, const char* type, const char* data, size_t size) { if (!type || !data) { errno = EINVAL; diff --git a/src/libpakfire/snapshot.c b/src/libpakfire/snapshot.c index cd4f321a9..3c8e9606e 100644 --- a/src/libpakfire/snapshot.c +++ b/src/libpakfire/snapshot.c @@ -33,7 +33,6 @@ #include #include #include -#include #include static int pakfire_snapshot_progressbar( @@ -61,7 +60,7 @@ ERROR: return 1; } -static struct archive* pakfire_snapshot_create_archive(Pakfire pakfire, FILE* f) { +static struct archive* pakfire_snapshot_create_archive(struct pakfire* pakfire, FILE* f) { struct archive* a = archive_write_new(); if (!a) { ERROR(pakfire, "archive_write_new() failed\n"); @@ -107,7 +106,7 @@ ERROR: return NULL; } -int pakfire_snapshot_create(Pakfire pakfire, FILE* f) { +int pakfire_snapshot_create(struct pakfire* pakfire, FILE* f) { int r = 1; const char* root = pakfire_get_path(pakfire); @@ -210,7 +209,7 @@ ERROR: return r; } -static int pakfire_snapshot_extract(Pakfire pakfire, FILE* f) { +static int pakfire_snapshot_extract(struct pakfire* pakfire, FILE* f) { struct pakfire_progressbar* progressbar = NULL; char buffer[PATH_MAX]; struct stat st; @@ -313,7 +312,7 @@ ERROR: return r; } -int pakfire_snapshot_restore(Pakfire pakfire, FILE* f) { +int pakfire_snapshot_restore(struct pakfire* pakfire, FILE* f) { struct pakfire_db* db = NULL; // Extract the archive diff --git a/src/libpakfire/solution.c b/src/libpakfire/solution.c index 1f85c0b05..93edfee57 100644 --- a/src/libpakfire/solution.c +++ b/src/libpakfire/solution.c @@ -32,7 +32,7 @@ #include struct pakfire_solution { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; struct pakfire_problem* problem; diff --git a/src/libpakfire/transaction.c b/src/libpakfire/transaction.c index 36e1c6155..2010ceacb 100644 --- a/src/libpakfire/transaction.c +++ b/src/libpakfire/transaction.c @@ -36,12 +36,11 @@ #include #include #include -#include #include #include struct pakfire_transaction { - Pakfire pakfire; + struct pakfire* pakfire; int nrefs; Transaction* transaction; @@ -213,7 +212,7 @@ static int pakfire_transaction_import_userinstalled( } int pakfire_transaction_create(struct pakfire_transaction** transaction, - Pakfire pakfire, Solver* solver) { + struct pakfire* pakfire, Solver* solver) { struct pakfire_transaction* t = calloc(1, sizeof(*t)); if (!t) return ENOMEM; diff --git a/src/libpakfire/ui.c b/src/libpakfire/ui.c index 02db59989..22f25cc1b 100644 --- a/src/libpakfire/ui.c +++ b/src/libpakfire/ui.c @@ -25,10 +25,9 @@ #include #include #include -#include #include -int pakfire_ui_confirm(Pakfire pakfire, const char* message, const char* question) { +int pakfire_ui_confirm(struct pakfire* pakfire, const char* message, const char* question) { // The message is only printed once printf("%s\n", message); @@ -79,7 +78,7 @@ END: return r; } -static int pakfire_ui_enter_number(Pakfire pakfire, const char* question, +static int pakfire_ui_enter_number(struct pakfire* pakfire, const char* question, unsigned int* choice, unsigned int min, unsigned int max) { // Skip this, if running in non-interactive mode if (pakfire_has_flag(pakfire, PAKFIRE_FLAGS_NON_INTERACTIVE)) @@ -156,7 +155,7 @@ static struct pakfire_solution** pakfire_ui_append_solutions( return list; } -int pakfire_ui_pick_solution(Pakfire pakfire, struct pakfire_request* request, +int pakfire_ui_pick_solution(struct pakfire* pakfire, struct pakfire_request* request, struct pakfire_problem** problems) { if (!problems) { errno = EINVAL; diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c index f3e16b2ed..088c6809a 100644 --- a/src/libpakfire/util.c +++ b/src/libpakfire/util.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #define NSEC_PER_SEC 1000000000 @@ -67,7 +66,7 @@ static Id pakfire_parse_namespace(Pool* pool, const char* s) { return pool_rel2id(pool, namespace, id, REL_NAMESPACE, 1); } -Id pakfire_parse_dep(Pakfire pakfire, const char* s) { +Id pakfire_parse_dep(struct pakfire* pakfire, const char* s) { Id id; if (!s) { @@ -134,7 +133,7 @@ Id pakfire_parse_dep(Pakfire pakfire, const char* s) { return id; } -void pakfire_parse_deps(Pakfire pakfire, struct pakfire_package* pkg, +void pakfire_parse_deps(struct pakfire* pakfire, struct pakfire_package* pkg, void (*func)(struct pakfire_package* pkg, const char* dep), const char* deps) { char* p = strdupa(deps); @@ -738,7 +737,7 @@ int pakfire_archive_copy_data(struct archive* src, struct archive* dst, } } -int pakfire_archive_copy_data_to_buffer(Pakfire pakfire, struct archive* a, +int pakfire_archive_copy_data_to_buffer(struct pakfire* pakfire, struct archive* a, struct archive_entry* entry, char** data, size_t* data_size) { *data = NULL; *data_size = 0; @@ -766,7 +765,7 @@ int pakfire_archive_copy_data_to_buffer(Pakfire pakfire, struct archive* a, // JSON Stuff -static struct json_object* pakfire_json_parse(Pakfire pakfire, FILE* f) { +static struct json_object* pakfire_json_parse(struct pakfire* pakfire, FILE* f) { struct json_tokener* tokener = NULL; struct json_object* json = NULL; char* buffer = NULL; @@ -809,7 +808,7 @@ ERROR: return json; } -struct json_object* pakfire_json_parse_from_file(Pakfire pakfire, const char* path) { +struct json_object* pakfire_json_parse_from_file(struct pakfire* pakfire, const char* path) { FILE* f = fopen(path, "r"); if (!f) return NULL; @@ -864,7 +863,7 @@ int timespec_lt(struct timespec* t1, struct timespec* t2) { // Resource Limits -int pakfire_rlimit_set(Pakfire pakfire, int limit) { +int pakfire_rlimit_set(struct pakfire* pakfire, int limit) { struct rlimit rl; // Sanity check @@ -900,6 +899,6 @@ int pakfire_rlimit_set(Pakfire pakfire, int limit) { Resets RLIMIT_NOFILE to FD_SETSIZE (e.g. 1024) for compatibility with software that uses select() */ -int pakfire_rlimit_reset_nofile(Pakfire pakfire) { +int pakfire_rlimit_reset_nofile(struct pakfire* pakfire) { return pakfire_rlimit_set(pakfire, FD_SETSIZE); }