From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 15 Jun 2021 11:36:08 +0000 (+0000)
Subject: pakfire: Make pakfire_log_set_function private
X-Git-Tag: 0.9.28~1240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cab86933e76d3fb89b9382f52ac88fe958f9dd4;p=pakfire.git

pakfire: Make pakfire_log_set_function private

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

diff --git a/src/libpakfire/include/pakfire/pakfire.h b/src/libpakfire/include/pakfire/pakfire.h
index 5457d94f5..1669925ed 100644
--- a/src/libpakfire/include/pakfire/pakfire.h
+++ b/src/libpakfire/include/pakfire/pakfire.h
@@ -75,8 +75,6 @@ void pakfire_log(Pakfire pakfire, int priority, const char *file,
 	int line, const char *fn, const char *format, ...)
 	__attribute__((format(printf, 6, 7)));
 
-void pakfire_log_set_function(Pakfire pakfire,
-	pakfire_log_function_t log_function, void* data);
 int pakfire_log_get_priority(Pakfire pakfire);
 void pakfire_log_set_priority(Pakfire pakfire, int priority);
 
diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 64dcd8e2a..477d85d76 100644
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -333,6 +333,12 @@ static int pakfire_populate_dev(Pakfire pakfire) {
 	return 0;
 }
 
+static void pakfire_log_set_function(Pakfire pakfire,
+		pakfire_log_function_t log_function, void* data) {
+	pakfire->log_function = log_function;
+	pakfire->log_data = data;
+}
+
 static int log_priority(const char* priority) {
 	char* end;
 
@@ -1404,12 +1410,6 @@ PAKFIRE_EXPORT int pakfire_cache_destroy(Pakfire pakfire, const char* path) {
 	return pakfire_rmtree(cache_path, 0);
 }
 
-PAKFIRE_EXPORT void pakfire_log_set_function(Pakfire pakfire,
-		pakfire_log_function_t log_function, void* data) {
-	pakfire->log_function = log_function;
-	pakfire->log_data = data;
-}
-
 PAKFIRE_EXPORT int pakfire_log_get_priority(Pakfire pakfire) {
 	return pakfire->log_priority;
 }
diff --git a/tests/testsuite.c b/tests/testsuite.c
index 25e7c7831..29e61537b 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -45,7 +45,8 @@ static int test_run(int i, struct test* t) {
 	LOG("running %s (%s)\n", t->name, root);
 
 	// Create a pakfire instance
-	r = pakfire_create(&t->pakfire, root, NULL, TEST_SRC_PATH "/pakfire.conf", 0);
+	r = pakfire_create(&t->pakfire, root, NULL, TEST_SRC_PATH "/pakfire.conf", 0,
+		pakfire_log_stderr, NULL);
 	if (r) {
 		LOG("ERROR: Could not initialize Pakfire: %s\n", strerror(errno));
 		exit(1);
@@ -53,9 +54,6 @@ static int test_run(int i, struct test* t) {
 
 	ASSERT(t->pakfire);
 
-	// Log to stderr
-	pakfire_log_set_function(t->pakfire, pakfire_log_stderr);
-
 	// Enable debug logging
 	pakfire_log_set_priority(t->pakfire, LOG_DEBUG);