From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 23 Aug 2022 16:23:01 +0000 (+0000)
Subject: build: Use simpler function to add files
X-Git-Tag: 0.9.28~392
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80a108bf0e4808eb1708e092a49757a0abfd51af;p=pakfire.git

build: Use simpler function to add files

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

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index b24d77327..6b684a427 100644
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -354,11 +354,7 @@ static int pakfire_build_package_add_files(struct pakfire_build* build,
 		struct pakfire_file* file = pakfire_filelist_get(filelist, i);
 
 		// Add the file to the package
-		r = pakfire_packager_add(
-			packager,
-			pakfire_file_get_abspath(file),
-			pakfire_file_get_path(file)
-		);
+		r = pakfire_packager_add_file(packager, file);
 		if (r) {
 			pakfire_file_unref(file);
 			goto ERROR;
diff --git a/src/libpakfire/include/pakfire/packager.h b/src/libpakfire/include/pakfire/packager.h
index 5e147a76e..dad1b90f2 100644
--- a/src/libpakfire/include/pakfire/packager.h
+++ b/src/libpakfire/include/pakfire/packager.h
@@ -23,6 +23,7 @@
 
 #ifdef PAKFIRE_PRIVATE
 
+#include <pakfire/file.h>
 #include <pakfire/package.h>
 #include <pakfire/scriptlet.h>
 
@@ -40,6 +41,8 @@ int pakfire_packager_finish(struct pakfire_packager* packager, FILE* f);
 int pakfire_packager_finish_to_directory(struct pakfire_packager* packager,
 	const char* target, char** result);
 
+int pakfire_packager_add_file(
+	struct pakfire_packager* packager, struct pakfire_file* file);
 int pakfire_packager_add(struct pakfire_packager* packager,
 	const char* sourcepath, const char* path);
 
diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index 0e4fa45ea..d8148def7 100644
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -640,8 +640,7 @@ ERROR:
 	return r;
 }
 
-static int pakfire_packager_add_file(struct pakfire_packager* packager,
-		struct pakfire_file* file) {
+int pakfire_packager_add_file(struct pakfire_packager* packager, struct pakfire_file* file) {
 	struct archive_entry* entry = NULL;
 	FILE* f = NULL;
 	int r;