From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 3 Jun 2021 19:41:50 +0000 (+0000)
Subject: libpakfire: Make db functions private
X-Git-Tag: 0.9.28~1285^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c78c483c882617c142b171299e82f7deb4c9af5;p=pakfire.git

libpakfire: Make db functions private

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

diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index ddb702d9c..17f0db68c 100644
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -31,7 +31,6 @@
 #include <pakfire/logging.h>
 #include <pakfire/package.h>
 #include <pakfire/pakfire.h>
-#include <pakfire/private.h>
 #include <pakfire/repo.h>
 #include <pakfire/types.h>
 #include <pakfire/util.h>
@@ -446,7 +445,7 @@ static int pakfire_db_setup(struct pakfire_db* db) {
 	return 0;
 }
 
-PAKFIRE_EXPORT int pakfire_db_open(struct pakfire_db** db, Pakfire pakfire, int flags) {
+int pakfire_db_open(struct pakfire_db** db, Pakfire pakfire, int flags) {
 	int r = 1;
 
 	struct pakfire_db* o = calloc(1, sizeof(*o));
@@ -497,13 +496,13 @@ END:
 	return r;
 }
 
-PAKFIRE_EXPORT struct pakfire_db* pakfire_db_ref(struct pakfire_db* db) {
+struct pakfire_db* pakfire_db_ref(struct pakfire_db* db) {
 	db->nrefs++;
 
 	return db;
 }
 
-PAKFIRE_EXPORT struct pakfire_db* pakfire_db_unref(struct pakfire_db* db) {
+struct pakfire_db* pakfire_db_unref(struct pakfire_db* db) {
 	if (--db->nrefs > 0)
 		return db;
 
@@ -609,7 +608,7 @@ static unsigned long pakfire_db_foreign_key_check(struct pakfire_db* db) {
 /*
 	This function performs an integrity check of the database
 */
-PAKFIRE_EXPORT int pakfire_db_check(struct pakfire_db* db) {
+int pakfire_db_check(struct pakfire_db* db) {
 	int r;
 
 	// Perform integrity check
@@ -626,7 +625,7 @@ PAKFIRE_EXPORT int pakfire_db_check(struct pakfire_db* db) {
 }
 
 // Returns the number of packages installed
-PAKFIRE_EXPORT ssize_t pakfire_db_packages(struct pakfire_db* db) {
+ssize_t pakfire_db_packages(struct pakfire_db* db) {
 	sqlite3_stmt* stmt = NULL;
 	ssize_t packages = -1;
 
@@ -995,7 +994,7 @@ END:
 	return r;
 }
 
-PAKFIRE_EXPORT int pakfire_db_add_package(struct pakfire_db* db,
+int pakfire_db_add_package(struct pakfire_db* db,
 		PakfirePackage pkg, PakfireArchive archive) {
 	sqlite3_stmt* stmt = NULL;
 	int r;
@@ -1235,7 +1234,7 @@ ROLLBACK:
 	return 1;
 }
 
-PAKFIRE_EXPORT int pakfire_db_remove_package(struct pakfire_db* db, PakfirePackage pkg) {
+int pakfire_db_remove_package(struct pakfire_db* db, PakfirePackage pkg) {
 	sqlite3_stmt* stmt = NULL;
 	int r = 1;
 
diff --git a/src/libpakfire/include/pakfire/db.h b/src/libpakfire/include/pakfire/db.h
index 8873e651d..60d8fac35 100644
--- a/src/libpakfire/include/pakfire/db.h
+++ b/src/libpakfire/include/pakfire/db.h
@@ -21,8 +21,11 @@
 #ifndef PAKFIRE_DB_H
 #define PAKFIRE_DB_H
 
+#ifdef PAKFIRE_PRIVATE
+
 #include <sys/types.h>
 
+#include <pakfire/scriptlet.h>
 #include <pakfire/types.h>
 
 struct pakfire_db;
@@ -44,10 +47,6 @@ ssize_t pakfire_db_packages(struct pakfire_db* db);
 int pakfire_db_add_package(struct pakfire_db* db, PakfirePackage pkg, PakfireArchive archive);
 int pakfire_db_remove_package(struct pakfire_db* db, PakfirePackage pkg);
 
-#ifdef PAKFIRE_PRIVATE
-
-#include <pakfire/scriptlet.h>
-
 int pakfire_db_load(struct pakfire_db* db, PakfireRepo repo);
 
 struct pakfire_scriptlet* pakfire_db_get_scriptlet(
diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index bb69a44d9..c175fb22a 100644
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -79,15 +79,6 @@ global:
 	pakfire_build;
 	pakfire_shell;
 
-	# db
-	pakfire_db_add_package;
-	pakfire_db_check;
-	pakfire_db_open;
-	pakfire_db_packages;
-	pakfire_db_ref;
-	pakfire_db_remove_package;
-	pakfire_db_unref;
-
 	# dist
 	pakfire_dist;