From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 20 Aug 2021 09:27:52 +0000 (+0000)
Subject: repo: Make pakfire_repo_add_archive private
X-Git-Tag: 0.9.28~985
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c111d5540c3e54ab8940691587e9c0c5bc688d3;p=pakfire.git

repo: Make pakfire_repo_add_archive private

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

diff --git a/src/libpakfire/include/pakfire/repo.h b/src/libpakfire/include/pakfire/repo.h
index 252276d61..c7700f277 100644
--- a/src/libpakfire/include/pakfire/repo.h
+++ b/src/libpakfire/include/pakfire/repo.h
@@ -27,8 +27,7 @@
 
 struct pakfire_repo;
 
-#include <pakfire/archive.h>
-#include <pakfire/package.h>
+#include <pakfire/pakfire.h>
 
 int pakfire_repo_create(struct pakfire_repo** repo, struct pakfire* pakfire, const char* name);
 
@@ -71,9 +70,6 @@ int pakfire_repo_is_installed_repo(struct pakfire_repo* repo);
 int pakfire_repo_read_solv(struct pakfire_repo* repo, FILE *f, int flags);
 int pakfire_repo_write_solv(struct pakfire_repo* repo, FILE *f, int flags);
 
-int pakfire_repo_add_archive(struct pakfire_repo* repo,
-	struct pakfire_archive* archive, struct pakfire_package** package);
-
 // Cache
 
 int pakfire_repo_clean(struct pakfire_repo* repo, int flags);
@@ -94,14 +90,18 @@ int pakfire_repo_compose(struct pakfire* pakfire, const char* path, int flags);
 
 #include <solv/repo.h>
 
+#include <pakfire/archive.h>
 #include <pakfire/config.h>
 #include <pakfire/downloader.h>
+#include <pakfire/package.h>
 
 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);
+int pakfire_repo_add_archive(struct pakfire_repo* repo,
+	struct pakfire_archive* archive, struct pakfire_package** package);
 
 struct pakfire_repo* pakfire_repo_create_from_repo(struct pakfire* pakfire, Repo* r);
 void pakfire_repo_free_all(struct pakfire* pakfire);
diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 146663f2f..8302a91e3 100644
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -232,7 +232,6 @@ global:
 	pakfire_progressbar_update;
 
 	# repo
-	pakfire_repo_add_archive;
 	pakfire_repo_cmp;
 	pakfire_repo_compose;
 	pakfire_repo_count;
diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index 233f02741..2a5b52470 100644
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -224,6 +224,19 @@ Id pakfire_repo_add_solvable(struct pakfire_repo* repo) {
 	return repo_add_solvable(repo->repo);
 }
 
+int pakfire_repo_add_archive(struct pakfire_repo* repo,
+		struct pakfire_archive* archive, struct pakfire_package** package) {
+	struct pakfire_package* p = pakfire_archive_make_package(archive, repo);
+
+	if (package)
+		*package = p;
+
+	if (p)
+		return 0;
+
+	return 1;
+}
+
 struct pakfire_mirrorlist* pakfire_repo_get_mirrorlist(struct pakfire_repo* repo) {
 	if (!repo->mirrorlist) {
 		// No cache path set
@@ -846,19 +859,6 @@ PAKFIRE_EXPORT int pakfire_repo_write_solv(struct pakfire_repo* repo, FILE *f, i
 	return r;
 }
 
-PAKFIRE_EXPORT int pakfire_repo_add_archive(struct pakfire_repo* repo,
-		struct pakfire_archive* archive, struct pakfire_package** package) {
-	struct pakfire_package* p = pakfire_archive_make_package(archive, repo);
-
-	if (package)
-		*package = p;
-
-	if (p)
-		return 0;
-
-	return 1;
-}
-
 PAKFIRE_EXPORT int pakfire_repo_clean(struct pakfire_repo* repo, int flags) {
 	char cache_path[PATH_MAX];