From 0ecfa7b1566de5b63a22137ffc208c48d56122b8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 27 Jun 2025 10:38:09 +0000 Subject: [PATCH] build: Create its own type Signed-off-by: Michael Tremer --- src/cli/lib/build.c | 4 +- src/cli/lib/image_create.c | 2 +- src/cli/lib/pakfire.c | 4 +- src/cli/lib/pakfire.h | 2 +- src/cli/lib/shell.c | 2 +- src/pakfire/build.c | 142 ++++++++++++++++++------------------- src/pakfire/build.h | 18 ++--- src/pakfire/job.c | 4 +- tests/libpakfire/build.c | 4 +- 9 files changed, 91 insertions(+), 91 deletions(-) diff --git a/src/cli/lib/build.c b/src/cli/lib/build.c index 001ac74f..ea6d3f68 100644 --- a/src/cli/lib/build.c +++ b/src/cli/lib/build.c @@ -163,7 +163,7 @@ static void log_callback(void* data, int priority, const char* file, int line, } static int result_callback(pakfire_ctx* ctx, struct pakfire* pakfire, - struct pakfire_build* build, pakfire_archive* archive, void* data) { + pakfire_build* build, pakfire_archive* archive, void* data) { const struct cli_local_args* local_args = data; struct pakfire_package* pkg = NULL; struct pakfire_repo* local = NULL; @@ -226,7 +226,7 @@ int cli_build(void* data, int argc, char* argv[]) { BUILD_ENABLE_SNAPSHOT | BUILD_ENABLE_TESTS, }; - struct pakfire_build* build = NULL; + pakfire_build* build = NULL; int flags = PAKFIRE_BUILD_LOCAL; int r; diff --git a/src/cli/lib/image_create.c b/src/cli/lib/image_create.c index f422b7e0..8ab48d7f 100644 --- a/src/cli/lib/image_create.c +++ b/src/cli/lib/image_create.c @@ -67,7 +67,7 @@ static error_t parse(int key, char* arg, struct argp_state* state, void* data) { int cli_image_create(void* data, int argc, char* argv[]) { struct cli_global_args* global_args = data; struct cli_local_args local_args = {}; - struct pakfire_build* build = NULL; + pakfire_build* build = NULL; struct pakfire* pakfire = NULL; FILE* f = NULL; int r; diff --git a/src/cli/lib/pakfire.c b/src/cli/lib/pakfire.c index eedcdfa1..3f8d5675 100644 --- a/src/cli/lib/pakfire.c +++ b/src/cli/lib/pakfire.c @@ -114,9 +114,9 @@ ERROR: return r; } -int cli_setup_build(struct pakfire_build** build, struct cli_global_args* args, int flags) { +int cli_setup_build(pakfire_build** build, struct cli_global_args* args, int flags) { struct pakfire_config* config = NULL; - struct pakfire_build* b = NULL; + pakfire_build* b = NULL; int r; // Setup the configuration diff --git a/src/cli/lib/pakfire.h b/src/cli/lib/pakfire.h index 3f194054..4ad983e5 100644 --- a/src/cli/lib/pakfire.h +++ b/src/cli/lib/pakfire.h @@ -48,7 +48,7 @@ struct cli_global_args { int cli_setup_config(struct pakfire_config** config, struct cli_global_args* args); int cli_setup_pakfire(struct pakfire** pakfire, struct cli_global_args* args); -int cli_setup_build(struct pakfire_build** build, struct cli_global_args* args, int flags); +int cli_setup_build(pakfire_build** build, struct cli_global_args* args, int flags); int cli_setup_client(pakfire_client** client, struct cli_global_args* args); int cli_run_client(struct cli_global_args* args, pakfire_client_ready_callback callback, void* data); diff --git a/src/cli/lib/shell.c b/src/cli/lib/shell.c index 41af0b0c..a0273600 100644 --- a/src/cli/lib/shell.c +++ b/src/cli/lib/shell.c @@ -96,7 +96,7 @@ int cli_shell(void* data, int argc, char* argv[]) { .packages = {}, .num_packages = 0, }; - struct pakfire_build* build = NULL; + pakfire_build* build = NULL; int flags = PAKFIRE_BUILD_LOCAL | PAKFIRE_BUILD_INTERACTIVE; int r; diff --git a/src/pakfire/build.c b/src/pakfire/build.c index 5ef8560f..a6350bbb 100644 --- a/src/pakfire/build.c +++ b/src/pakfire/build.c @@ -110,11 +110,11 @@ struct pakfire_build { "\n" \ "exit 0\n" -static int pakfire_build_has_flag(struct pakfire_build* build, int flag) { +static int pakfire_build_has_flag(pakfire_build* build, int flag) { return build->flags & flag; } -static double pakfire_build_duration(struct pakfire_build* build) { +static double pakfire_build_duration(pakfire_build* build) { struct timespec now; int r; @@ -128,7 +128,7 @@ static double pakfire_build_duration(struct pakfire_build* build) { static int pakfire_build_output_callback(pakfire_ctx* ctx, void* data, const enum pakfire_jail_output_stream stream, const char* line, size_t length) { - struct pakfire_build* build = data; + pakfire_build* build = data; // Get the runtime of the build const double t = pakfire_build_duration(build); @@ -173,7 +173,7 @@ static int __pakfire_build_setup_repo(struct pakfire* pakfire, FILE* f = NULL; int r; - struct pakfire_build* build = (struct pakfire_build*)p; + pakfire_build* build = (pakfire_build*)p; // Skip processing the installed repository if (pakfire_repo_is_installed_repo(repo)) @@ -239,11 +239,11 @@ ERROR: This function enables the local repository so that it can be accessed by a pakfire instance running inside the chroot. */ -static int pakfire_build_enable_repos(struct pakfire_build* build) { +static int pakfire_build_enable_repos(pakfire_build* build) { return pakfire_repo_walk(build->pakfire, __pakfire_build_setup_repo, build); } -static int pakfire_build_read_script(struct pakfire_build* build, +static int pakfire_build_read_script(pakfire_build* build, const char* filename, char** buffer, size_t* length) { char path[PATH_MAX]; FILE* f = NULL; @@ -278,7 +278,7 @@ ERROR: } static int pakfire_build_run_script( - struct pakfire_build* build, + pakfire_build* build, const char* filename, const char* args[], pakfire_jail_input_callback input_callback, void* input_data, @@ -310,7 +310,7 @@ ERROR: } struct pakfire_find_deps_ctx { - struct pakfire_build* build; + pakfire_build* build; struct pakfire_package* pkg; struct pakfire_filelist* filelist; }; @@ -378,7 +378,7 @@ static int pakfire_build_process_pkgconfig_dep(struct pakfire_package* pkg, static int pakfire_build_process_pkgconfig_provides(pakfire_ctx* ctx, void* data, const enum pakfire_jail_output_stream stream, const char* line, const size_t length) { struct pakfire_find_deps_ctx* deps = data; - struct pakfire_build* self = deps->build; + pakfire_build* self = deps->build; switch (stream) { // Process any output @@ -397,7 +397,7 @@ static int pakfire_build_process_pkgconfig_provides(pakfire_ctx* ctx, void* data static int pakfire_build_process_pkgconfig_requires(pakfire_ctx* ctx, void* data, const enum pakfire_jail_output_stream stream, const char* line, const size_t length) { struct pakfire_find_deps_ctx* deps = data; - struct pakfire_build* self = deps->build; + pakfire_build* self = deps->build; switch (stream) { // Process any output @@ -796,7 +796,7 @@ static int pakfire_build_add_perl_requires(pakfire_ctx* ctx, void* data, return 0; } -static int pakfire_build_find_perl_deps(struct pakfire_build* build, +static int pakfire_build_find_perl_deps(pakfire_build* build, struct pakfire_package* pkg, struct pakfire_filelist* filelist) { struct pakfire_filelist* perlfiles = NULL; const char* args[] = { @@ -842,7 +842,7 @@ ERROR: return r; } -static int pakfire_build_find_dependencies(struct pakfire_build* build, +static int pakfire_build_find_dependencies(pakfire_build* build, struct pakfire_parser* makefile, const char* namespace, struct pakfire_package* pkg, struct pakfire_filelist* filelist) { char* filter_provides = NULL; @@ -927,7 +927,7 @@ static int __pakfire_build_package_mark_config_files( return 0; } -static int pakfire_build_package_mark_config_files(struct pakfire_build* build, +static int pakfire_build_package_mark_config_files(pakfire_build* build, struct pakfire_filelist* filelist, struct pakfire_parser* makefile, const char* namespace) { char** configfiles = NULL; int r; @@ -953,7 +953,7 @@ ERROR: return r; } -static int pakfire_build_package_add_files(struct pakfire_build* build, +static int pakfire_build_package_add_files(pakfire_build* build, struct pakfire_parser* makefile, const char* buildroot, const char* namespace, struct pakfire_package* pkg, struct pakfire_packager* packager) { struct pakfire_filelist* filelist = NULL; @@ -1056,7 +1056,7 @@ static int pakfire_build_extract_command( static int pakfire_build_process_scriptlet_dep(pakfire_ctx* ctx, void* data, const enum pakfire_jail_output_stream stream, const char* line, const size_t length) { struct pakfire_find_deps_ctx* deps = data; - struct pakfire_build* self = deps->build; + pakfire_build* self = deps->build; char command[PATH_MAX]; char path[PATH_MAX]; int r; @@ -1110,7 +1110,7 @@ static int pakfire_build_process_scriptlet_dep(pakfire_ctx* ctx, void* data, return 0; } -static int pakfire_build_add_scriptlet_requires(struct pakfire_build* build, +static int pakfire_build_add_scriptlet_requires(pakfire_build* build, struct pakfire_package* pkg, struct pakfire_scriptlet* scriptlet) { struct pakfire_input_buffer buffer = {}; int r; @@ -1139,7 +1139,7 @@ static int pakfire_build_add_scriptlet_requires(struct pakfire_build* build, pakfire_jail_send_buffer, &buffer, pakfire_build_process_scriptlet_dep, &ctx); } -static int pakfire_build_package_add_scriptlet(struct pakfire_build* build, +static int pakfire_build_package_add_scriptlet(pakfire_build* build, struct pakfire_package* pkg, struct pakfire_packager* packager, const char* type, const char* data) { struct pakfire_scriptlet* scriptlet = NULL; @@ -1182,7 +1182,7 @@ ERROR: return r; } -static int pakfire_build_package_add_scriptlets(struct pakfire_build* build, +static int pakfire_build_package_add_scriptlets(pakfire_build* build, struct pakfire_parser* makefile, const char* namespace, struct pakfire_package* pkg, struct pakfire_packager* packager) { char name[NAME_MAX]; @@ -1211,7 +1211,7 @@ static int pakfire_build_package_add_scriptlets(struct pakfire_build* build, return 0; } -static int pakfire_build_package(struct pakfire_build* build, struct pakfire_parser* makefile, +static int pakfire_build_package(pakfire_build* build, struct pakfire_parser* makefile, const char* buildroot, const char* namespace) { pakfire_archive* archive = NULL; struct pakfire_package* pkg = NULL; @@ -1322,7 +1322,7 @@ ERROR: static int pakfire_build_package_dump(pakfire_ctx* ctx, struct pakfire_package* pkg, void* p) { - struct pakfire_build* build = p; + pakfire_build* build = p; char* dump = pakfire_package_dump(pkg, PAKFIRE_PKG_DUMP_LONG); if (!dump) @@ -1334,7 +1334,7 @@ static int pakfire_build_package_dump(pakfire_ctx* ctx, return 0; } -static int pakfire_build_packages(struct pakfire_build* build, +static int pakfire_build_packages(pakfire_build* build, struct pakfire_parser* makefile) { INFO(build->ctx, "Creating packages..."); int r = 1; @@ -1376,7 +1376,7 @@ ERROR: return r; } -static int pakfire_build_stage(struct pakfire_build* build, +static int pakfire_build_stage(pakfire_build* build, struct pakfire_parser* makefile, const char* stage) { struct pakfire_env* env = NULL; char* script = NULL; @@ -1440,18 +1440,18 @@ enum { PAKFIRE_BUILD_SHOW_PROGRESS = (1 << 2), }; -struct pakfire_build_post_process_state { - struct pakfire_build* build; +typedef struct pakfire_build_post_process_state { + pakfire_build* build; // Filelist with files to remove struct pakfire_filelist* removees; -}; +} pakfire_build_post_process_state; /* This helper function takes a callback which is expected to add any files to the given filelist which will optionally be all removed after. */ -static int pakfire_build_post_process_files(struct pakfire_build* build, +static int pakfire_build_post_process_files(pakfire_build* build, struct pakfire_filelist* filelist, const char* description, pakfire_filelist_walk_callback callback, int flags) { struct pakfire_filelist* removees = NULL; @@ -1462,7 +1462,7 @@ static int pakfire_build_post_process_files(struct pakfire_build* build, if (r) goto ERROR; - struct pakfire_build_post_process_state state = { + pakfire_build_post_process_state state = { .build = build, .removees = removees, }; @@ -1506,7 +1506,7 @@ ERROR: static int __pakfire_build_remove_static_libraries( pakfire_ctx* ctx, struct pakfire_file* file, void* data) { - const struct pakfire_build_post_process_state* state = data; + const pakfire_build_post_process_state* state = data; char path[PATH_MAX]; int r; @@ -1531,7 +1531,7 @@ static int __pakfire_build_remove_static_libraries( } static int pakfire_build_post_remove_static_libraries( - struct pakfire_build* build, struct pakfire_filelist* filelist) { + pakfire_build* build, struct pakfire_filelist* filelist) { return pakfire_build_post_process_files(build, filelist, "Removing static libaries...", __pakfire_build_remove_static_libraries, @@ -1540,7 +1540,7 @@ static int pakfire_build_post_remove_static_libraries( static int __pakfire_build_remove_libtool_archives( pakfire_ctx* ctx, struct pakfire_file* file, void* data) { - const struct pakfire_build_post_process_state* state = data; + const pakfire_build_post_process_state* state = data; // Find all libtool archive files if (pakfire_file_matches(file, "**.la")) @@ -1550,7 +1550,7 @@ static int __pakfire_build_remove_libtool_archives( } static int pakfire_build_post_remove_libtool_archives( - struct pakfire_build* build, struct pakfire_filelist* filelist) { + pakfire_build* build, struct pakfire_filelist* filelist) { return pakfire_build_post_process_files(build, filelist, "Removing libtool archives...", __pakfire_build_remove_libtool_archives, @@ -1559,7 +1559,7 @@ static int pakfire_build_post_remove_libtool_archives( static int __pakfire_build_check_broken_symlinks( pakfire_ctx* ctx, struct pakfire_file* file, void* data) { - const struct pakfire_build_post_process_state* state = data; + const pakfire_build_post_process_state* state = data; int r; // Ignore anything that isn't a symlink @@ -1582,7 +1582,7 @@ static int __pakfire_build_check_broken_symlinks( } static int pakfire_build_post_check_broken_symlinks( - struct pakfire_build* build, struct pakfire_filelist* filelist) { + pakfire_build* build, struct pakfire_filelist* filelist) { return pakfire_build_post_process_files(build, filelist, "Broken symlinks have been found:", __pakfire_build_check_broken_symlinks, @@ -1615,7 +1615,7 @@ static int pakfire_build_fix_script_interpreter( static int pakfire_build_check_buildroot( pakfire_ctx* ctx, struct pakfire_file* file, void* data) { - const struct pakfire_build_post_process_state* state = data; + const pakfire_build_post_process_state* state = data; int r; // Skip Python byte-code files @@ -1646,7 +1646,7 @@ static int pakfire_build_check_buildroot( File Issues */ -static int pakfire_build_run_post_build_checks(struct pakfire_build* build) { +static int pakfire_build_run_post_build_checks(pakfire_build* build) { struct pakfire_filelist* filelist = NULL; int r; @@ -1709,7 +1709,7 @@ static const char* post_build_scripts[] = { NULL, }; -static int pakfire_build_run_post_build_scripts(struct pakfire_build* build) { +static int pakfire_build_run_post_build_scripts(pakfire_build* build) { // Set default arguments for build scripts const char* args[] = { build->buildroot, @@ -1726,7 +1726,7 @@ static int pakfire_build_run_post_build_scripts(struct pakfire_build* build) { return 0; } -static int pakfire_build_strip(struct pakfire_build* build) { +static int pakfire_build_strip(pakfire_build* build) { struct pakfire_stripper* stripper = NULL; int r; @@ -1747,7 +1747,7 @@ ERROR: return r; } -static void pakfire_build_free(struct pakfire_build* build) { +static void pakfire_build_free(pakfire_build* build) { if (build->repo) { pakfire_repo_clean(build->repo, PAKFIRE_REPO_CLEAN_FLAGS_DESTROY); pakfire_repo_unref(build->repo); @@ -1777,7 +1777,7 @@ static void pakfire_build_free(struct pakfire_build* build) { free(build); } -static int pakfire_build_parse_id(struct pakfire_build* build, const char* id) { +static int pakfire_build_parse_id(pakfire_build* build, const char* id) { int r; // Try parsing the Build ID @@ -1802,7 +1802,7 @@ static int pakfire_build_parse_id(struct pakfire_build* build, const char* id) { /* Sets up a new cgroup for this build */ -static int pakfire_build_setup_cgroup(struct pakfire_build* build) { +static int pakfire_build_setup_cgroup(pakfire_build* build) { struct pakfire_config* config = NULL; char path[PATH_MAX]; int r; @@ -1900,7 +1900,7 @@ ERROR: /* Sets up a new jail for this build */ -static int pakfire_build_setup_jail(struct pakfire_build* build) { +static int pakfire_build_setup_jail(pakfire_build* build) { int r; // Create a new jail @@ -1938,7 +1938,7 @@ static int pakfire_build_setup_jail(struct pakfire_build* build) { /* Sets up the ccache for this build */ -static int pakfire_build_setup_ccache(struct pakfire_build* build) { +static int pakfire_build_setup_ccache(pakfire_build* build) { int r; // Check if we want a ccache @@ -1993,7 +1993,7 @@ static int pakfire_build_setup_ccache(struct pakfire_build* build) { return 0; } -static int pakfire_build_setup_repo(struct pakfire_build* build) { +static int pakfire_build_setup_repo(pakfire_build* build) { char path[PATH_MAX] = PAKFIRE_TMP_DIR "/pakfire-build-repo.XXXXXX"; char url[PATH_MAX]; int r; @@ -2026,7 +2026,7 @@ static int pakfire_build_setup_repo(struct pakfire_build* build) { return r; } -static int pakfire_build_set_time_start(struct pakfire_build* build) { +static int pakfire_build_set_time_start(pakfire_build* build) { int r; // Fetch current time @@ -2038,7 +2038,7 @@ static int pakfire_build_set_time_start(struct pakfire_build* build) { } static int pakfire_build_setup_pakfire( - struct pakfire_build* build, struct pakfire_config* config, const char* arch) { + pakfire_build* build, struct pakfire_config* config, const char* arch) { int flags = PAKFIRE_FLAGS_BUILD; int r; @@ -2063,7 +2063,7 @@ static int pakfire_build_setup_pakfire( build environment. That will save us lots of path conversions because the path will always be the same, both inside and outside of the jail. */ -static int pakfire_build_setup_buildroot(struct pakfire_build* build) { +static int pakfire_build_setup_buildroot(pakfire_build* build) { char path[PATH_MAX] = PAKFIRE_TMP_DIR "/pakfire-buildroot.XXXXXX"; const char* buildroot = NULL; int r; @@ -2090,12 +2090,12 @@ static int pakfire_build_setup_buildroot(struct pakfire_build* build) { return 0; } -int pakfire_build_create(struct pakfire_build** build, pakfire_ctx* ctx, +int pakfire_build_create(pakfire_build** build, pakfire_ctx* ctx, struct pakfire_config* config, const char* arch, const char* id, int flags) { int r; // Allocate build object - struct pakfire_build* b = calloc(1, sizeof(*b)); + pakfire_build* b = calloc(1, sizeof(*b)); if (!b) return 1; @@ -2161,13 +2161,13 @@ ERROR: return r; } -struct pakfire_build* pakfire_build_ref(struct pakfire_build* build) { +pakfire_build* pakfire_build_ref(pakfire_build* build) { ++build->nrefs; return build; } -struct pakfire_build* pakfire_build_unref(struct pakfire_build* build) { +pakfire_build* pakfire_build_unref(pakfire_build* build) { if (--build->nrefs > 0) return build; @@ -2176,7 +2176,7 @@ struct pakfire_build* pakfire_build_unref(struct pakfire_build* build) { } int pakfire_build_set_ccache_path( - struct pakfire_build* build, const char* path) { + pakfire_build* build, const char* path) { // Check if this can be called if (pakfire_build_has_flag(build, PAKFIRE_BUILD_DISABLE_CCACHE)) return -EPERM; @@ -2189,7 +2189,7 @@ int pakfire_build_set_ccache_path( return pakfire_string_set(build->ccache_path, path); } -static int pakfire_build_read_makefile(struct pakfire_build* build, +static int pakfire_build_read_makefile(pakfire_build* build, struct pakfire_parser** parser, struct pakfire_package* package) { char path[PATH_MAX]; int r; @@ -2229,7 +2229,7 @@ ERROR: return r; } -static int pakfire_build_perform(struct pakfire_build* build, +static int pakfire_build_perform(pakfire_build* build, struct pakfire_parser* makefile) { int r; @@ -2302,7 +2302,7 @@ static int __pakfire_build_unpackaged_file( return 0; } -static int pakfire_build_check_unpackaged_files(struct pakfire_build* build) { +static int pakfire_build_check_unpackaged_files(pakfire_build* build) { struct pakfire_filelist* filelist = NULL; int r; @@ -2342,7 +2342,7 @@ static int pakfire_build_install_package(pakfire_ctx* ctx, PAKFIRE_JOB_INSTALL, pkg, PAKFIRE_JOB_ESSENTIAL); } -static int pakfire_build_install_test(struct pakfire_build* build) { +static int pakfire_build_install_test(pakfire_build* build) { struct pakfire_transaction* transaction = NULL; char* problems = NULL; int r; @@ -2385,7 +2385,7 @@ ERROR: return r; } -static int pakfire_build_post_check(struct pakfire_build* build) { +static int pakfire_build_post_check(pakfire_build* build) { int r; // Check for unpackaged files @@ -2401,7 +2401,7 @@ static int pakfire_build_post_check(struct pakfire_build* build) { return 0; } -static int pakfire_build_init(struct pakfire_build* build, +static int pakfire_build_init(pakfire_build* build, struct pakfire_package* package, const char** packages) { struct pakfire_transaction* transaction = NULL; char* problems = NULL; @@ -2472,7 +2472,7 @@ static int pakfire_build_lint_archive( return pakfire_archive_lint(archive, NULL, NULL); } -static int pakfire_build_lint(struct pakfire_build* build) { +static int pakfire_build_lint(pakfire_build* build) { int r; // Lint all packages @@ -2485,18 +2485,18 @@ static int pakfire_build_lint(struct pakfire_build* build) { return r; } -struct pakfire_build_result { - struct pakfire_build* build; +typedef struct pakfire_build_result { + pakfire_build* build; // Callback pakfire_build_result_callback callback; void* data; -}; +} pakfire_build_result; -static int pakfire_build_result(pakfire_ctx* ctx, struct pakfire_package* pkg, +static int __pakfire_build_result(pakfire_ctx* ctx, struct pakfire_package* pkg, pakfire_archive* archive, void* data) { - const struct pakfire_build_result* result = data; - struct pakfire_build* build = result->build; + const pakfire_build_result* result = data; + pakfire_build* build = result->build; int r; // Call the callback @@ -2509,7 +2509,7 @@ static int pakfire_build_result(pakfire_ctx* ctx, struct pakfire_package* pkg, return 0; } -int pakfire_build_exec(struct pakfire_build* build, const char* path, +int pakfire_build_exec(pakfire_build* build, const char* path, pakfire_build_result_callback result_callback, void* data) { struct pakfire_package* package = NULL; struct pakfire_parser* makefile = NULL; @@ -2587,13 +2587,13 @@ int pakfire_build_exec(struct pakfire_build* build, const char* path, // Call the result callback (if any) if (result_callback) { - struct pakfire_build_result result = { + pakfire_build_result result = { .build = build, .callback = result_callback, .data = data, }; - r = pakfire_repo_walk_archives(build->repo, pakfire_build_result, &result, 0); + r = pakfire_repo_walk_archives(build->repo, __pakfire_build_result, &result, 0); if (r < 0) goto ERROR; } @@ -2616,7 +2616,7 @@ ERROR: return r; } -static int pakfire_build_mkimage_install_deps(struct pakfire_build* build, +static int pakfire_build_mkimage_install_deps(pakfire_build* build, const char* type) { struct pakfire_transaction* transaction = NULL; char requires[NAME_MAX]; @@ -2664,7 +2664,7 @@ ERROR: return r; } -static int pakfire_build_collect_packages(struct pakfire_build* build, const char* path) { +static int pakfire_build_collect_packages(pakfire_build* build, const char* path) { struct pakfire_transaction* transaction = NULL; char* problems = NULL; char* p = NULL; @@ -2738,7 +2738,7 @@ ERROR: return r; } -int pakfire_build_mkimage(struct pakfire_build* build, +int pakfire_build_mkimage(pakfire_build* build, const char* type, FILE* f) { FILE* t = NULL; char packagesdir[PATH_MAX]; @@ -2850,7 +2850,7 @@ ERROR: /* Drops the user into a shell */ -int pakfire_build_shell(struct pakfire_build* build, const char* argv[], const char** packages) { +int pakfire_build_shell(pakfire_build* build, const char* argv[], const char** packages) { int r; // Initialize the build environment diff --git a/src/pakfire/build.h b/src/pakfire/build.h index c472e7f9..817eb16f 100644 --- a/src/pakfire/build.h +++ b/src/pakfire/build.h @@ -25,7 +25,7 @@ #include #include -struct pakfire_build; +typedef struct pakfire_build pakfire_build; enum pakfire_build_flags { PAKFIRE_BUILD_ENABLE_SNAPSHOT = (1 << 0), @@ -36,22 +36,22 @@ enum pakfire_build_flags { }; typedef int (*pakfire_build_result_callback)(pakfire_ctx* ctx, struct pakfire* pakfire, - struct pakfire_build* build, pakfire_archive* archive, void* data); + pakfire_build* build, pakfire_archive* archive, void* data); -int pakfire_build_create(struct pakfire_build** build, pakfire_ctx* ctx, +int pakfire_build_create(pakfire_build** build, pakfire_ctx* ctx, struct pakfire_config* config, const char* arch, const char* id, int flags); -struct pakfire_build* pakfire_build_ref(struct pakfire_build* build); -struct pakfire_build* pakfire_build_unref(struct pakfire_build* build); +pakfire_build* pakfire_build_ref(pakfire_build* build); +pakfire_build* pakfire_build_unref(pakfire_build* build); -int pakfire_build_set_ccache_path(struct pakfire_build* build, const char* path); +int pakfire_build_set_ccache_path(pakfire_build* build, const char* path); -int pakfire_build_shell(struct pakfire_build* build, const char* argv[], const char** packages); +int pakfire_build_shell(pakfire_build* build, const char* argv[], const char** packages); -int pakfire_build_exec(struct pakfire_build* build, const char* path, +int pakfire_build_exec(pakfire_build* build, const char* path, pakfire_build_result_callback result_callback, void* data); -int pakfire_build_mkimage(struct pakfire_build* build, +int pakfire_build_mkimage(pakfire_build* build, const char* type, FILE* f); int pakfire_build_clean(struct pakfire* pakfire, int flags); diff --git a/src/pakfire/job.c b/src/pakfire/job.c index 6060c140..db8ff44e 100644 --- a/src/pakfire/job.c +++ b/src/pakfire/job.c @@ -407,7 +407,7 @@ static int pakfire_job_logfile_uploaded(pakfire_client* client, } static int pakfire_job_result(pakfire_ctx* ctx, struct pakfire* pakfire, - struct pakfire_build* build, pakfire_archive* archive, void* data) { + pakfire_build* build, pakfire_archive* archive, void* data) { struct pakfire_job* self = data; struct pakfire_package* pkg = NULL; const char* filename = NULL; @@ -615,7 +615,7 @@ static void pakfire_job_log(void* data, int priority, const char* file, static int pakfire_job_child(struct pakfire_job* job) { pakfire_ctx* ctx = NULL; - struct pakfire_build* build = NULL; + pakfire_build* build = NULL; int build_flags = 0; int r; diff --git a/tests/libpakfire/build.c b/tests/libpakfire/build.c index bf9f6067..dfb70e24 100644 --- a/tests/libpakfire/build.c +++ b/tests/libpakfire/build.c @@ -25,7 +25,7 @@ #include "../testsuite.h" static int test_create_and_free(const struct test* t) { - struct pakfire_build* build = NULL; + pakfire_build* build = NULL; // Create a new build ASSERT_SUCCESS(pakfire_build_create(&build, t->ctx, t->config, NULL, NULL, 0)); @@ -43,7 +43,7 @@ FAIL: } static int test_create_with_invalid_ids(const struct test* t) { - struct pakfire_build* build = NULL; + pakfire_build* build = NULL; // Try to create a build with an invalid UUID ASSERT_ERROR(pakfire_build_create(&build, t->ctx, t->config, NULL, "ABC", 0), EINVAL); -- 2.47.2