From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 Aug 2022 17:03:15 +0000 (+0000)
Subject: build: Pass context to pakfire_build_package_add_scriptlets
X-Git-Tag: 0.9.28~562
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9df89a8fc8fbcd6853235bed625e15b3f1c14c42;p=pakfire.git

build: Pass context to pakfire_build_package_add_scriptlets

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

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index b83b41740..59728da3d 100644
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -365,17 +365,17 @@ ERROR:
 	return r;
 }
 
-static int pakfire_build_add_scriptlet_requires(struct pakfire* pakfire, struct pakfire_package* pkg,
-		struct pakfire_scriptlet* scriptlet) {
+static int pakfire_build_add_scriptlet_requires(struct pakfire_build* build,
+		struct pakfire_package* pkg, struct pakfire_scriptlet* scriptlet) {
 	char** prerequires = NULL;
 	char path[PATH_MAX];
 	size_t size;
 	int r;
 
-	const char* root = pakfire_get_path(pakfire);
+	const char* root = pakfire_get_path(build->pakfire);
 
 	// Make filename
-	r = pakfire_make_path(pakfire, path, "tmp/.pakfire-scriptlet.XXXXXX");
+	r = pakfire_make_path(build->pakfire, path, "tmp/.pakfire-scriptlet.XXXXXX");
 	if (r < 0)
 		return r;
 
@@ -390,7 +390,7 @@ static int pakfire_build_add_scriptlet_requires(struct pakfire* pakfire, struct
 	// Write scriptlet
 	ssize_t bytes_written = fwrite(data, 1, size, f);
 	if (bytes_written < 0) {
-		ERROR(pakfire, "Could not write to %s: %m\n", path);
+		ERROR(build->pakfire, "Could not write to %s: %m\n", path);
 		fclose(f);
 		goto ERROR;
 	}
@@ -405,14 +405,14 @@ static int pakfire_build_add_scriptlet_requires(struct pakfire* pakfire, struct
 	};
 
 	// Find all pre-requires
-	r = pakfire_build_run_script(pakfire, "find-prerequires", args, &prerequires);
+	r = pakfire_build_run_script(build->pakfire, "find-prerequires", args, &prerequires);
 	if (r)
 		goto ERROR;
 
 	// Add all pre-requires to the package
 	if (prerequires) {
 		for (char** element = prerequires; *element; element++) {
-			DEBUG(pakfire, "Adding pre-requires: %s\n", *element);
+			DEBUG(build->pakfire, "Adding pre-requires: %s\n", *element);
 			pakfire_package_add_prerequires(pkg, *element);
 		}
 	}
@@ -428,8 +428,9 @@ ERROR:
 	return r;
 }
 
-static int pakfire_build_package_add_scriptlet(struct pakfire* pakfire, struct pakfire_package* pkg,
-		struct pakfire_packager* packager, const char* type, const char* data) {
+static int pakfire_build_package_add_scriptlet(struct pakfire_build* build,
+		struct pakfire_package* pkg, struct pakfire_packager* packager,
+		const char* type, const char* data) {
 	struct pakfire_scriptlet* scriptlet = NULL;
 	char* shell = NULL;
 	int r;
@@ -440,21 +441,21 @@ static int pakfire_build_package_add_scriptlet(struct pakfire* pakfire, struct p
 		goto ERROR;
 
 	// Create a scriptlet
-	r = pakfire_scriptlet_create(&scriptlet, pakfire, type, shell, 0);
+	r = pakfire_scriptlet_create(&scriptlet, build->pakfire, type, shell, 0);
 	if (r)
 		goto ERROR;
 
 	// Add it to the package
 	r = pakfire_packager_add_scriptlet(packager, scriptlet);
 	if (r) {
-		ERROR(pakfire, "Could not add scriptlet %s\n", type);
+		ERROR(build->pakfire, "Could not add scriptlet %s\n", type);
 		goto ERROR;
 	}
 
 	// Add scriptlet requirements
-	r = pakfire_build_add_scriptlet_requires(pakfire, pkg, scriptlet);
+	r = pakfire_build_add_scriptlet_requires(build, pkg, scriptlet);
 	if (r) {
-		ERROR(pakfire, "Could not add scriptlet requirements: %m\n");
+		ERROR(build->pakfire, "Could not add scriptlet requirements: %m\n");
 		goto ERROR;
 	}
 
@@ -470,8 +471,9 @@ ERROR:
 	return r;
 }
 
-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) {
+static int pakfire_build_package_add_scriptlets(struct pakfire_build* build,
+		struct pakfire_parser* makefile, const char* namespace,
+		struct pakfire_package* pkg, struct pakfire_packager* packager) {
 	char name[NAME_MAX];
 	int r;
 
@@ -486,7 +488,7 @@ static int pakfire_build_package_add_scriptlets(struct pakfire* pakfire, struct
 			continue;
 
 		// Add it to the package
-		r = pakfire_build_package_add_scriptlet(pakfire, pkg, packager, *type, data);
+		r = pakfire_build_package_add_scriptlet(build, pkg, packager, *type, data);
 		if (r) {
 			free(data);
 			return r;
@@ -559,7 +561,7 @@ static int pakfire_build_package(struct pakfire_build* build, struct pakfire_par
 		goto ERROR;
 
 	// Add scriptlets
-	r = pakfire_build_package_add_scriptlets(build->pakfire, makefile, namespace,
+	r = pakfire_build_package_add_scriptlets(build, makefile, namespace,
 		pkg, packager);
 	if (r)
 		goto ERROR;