From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 10 Apr 2021 14:46:54 +0000 (+0000)
Subject: util: Make pakfire_string_startswith private
X-Git-Tag: 0.9.28~1285^2~389
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=714c91a25cf21cd772f005720ce8b605667e5703;p=pakfire.git

util: Make pakfire_string_startswith private

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

diff --git a/Makefile.am b/Makefile.am
index 9052a26a4..c3599938f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -556,14 +556,20 @@ tests_libpakfire_repo_LDADD = \
 	$(PAKFIRE_LIBS)
 
 dist_tests_libpakfire_util_SOURCES = \
-	tests/libpakfire/util.c
+	tests/libpakfire/util.c \
+	src/libpakfire/util.c
 
 tests_libpakfire_util_CPPFLAGS = \
-	$(TESTSUITE_CPPFLAGS)
+	$(TESTSUITE_CPPFLAGS) \
+	$(JSON_C_CFLAGS) \
+	-DPAKFIRE_PRIVATE
 
 tests_libpakfire_util_LDADD = \
 	$(TESTSUITE_LDADD) \
-	$(PAKFIRE_LIBS)
+	$(PAKFIRE_LIBS) \
+	$(ARCHIVE_LIBS) \
+	$(JSON_C_LIBS) \
+	$(UUID_LIBS)
 
 # ------------------------------------------------------------------------------
 
diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index aa5f989ae..1640d00c7 100644
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -28,7 +28,6 @@
 
 #include <pakfire/types.h>
 
-int pakfire_string_startswith(const char* s, const char* prefix);
 int pakfire_string_partition(const char* s, const char* delim, char** s1, char** s2);
 char* pakfire_string_replace(const char* s, const char* pattern, const char* repl);
 
@@ -55,6 +54,7 @@ char* pakfire_generate_uuid();
 
 #define pakfire_string_set(s, value) snprintf(s, sizeof(s) - 1, "%s", value)
 
+int pakfire_string_startswith(const char* s, const char* prefix);
 int pakfire_string_endswith(const char* s, const char* suffix);
 char* pakfire_unquote_in_place(char* s);
 
diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index bca81fdd1..55ac4a3c4 100644
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -415,7 +415,6 @@ global:
 	pakfire_split_string;
 	pakfire_string_partition;
 	pakfire_string_replace;
-	pakfire_string_startswith;
 
 local:
 	*;
diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 3f499e292..98e111d2a 100644
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -45,7 +45,7 @@
 
 #define NSEC_PER_SEC 1000000000
 
-PAKFIRE_EXPORT int pakfire_string_startswith(const char* s, const char* prefix) {
+int pakfire_string_startswith(const char* s, const char* prefix) {
 	return !strncmp(s, prefix, strlen(prefix));
 }