Prep v221: Update and clean up build system to sync with upstream

[elogind.git] / src / basic / strv.c

diff --git a/src/shared/strv.c b/src/basic/strv.c
similarity index 98%
rename from src/shared/strv.c
rename to src/basic/strv.c
index d44a72fc484d09966ac745066499a71cedd05c65..31d83f3efd9a7e38e8a65ec3bab9f885c48efbc7 100644 (file)
--- a/src/shared/strv.c
+++ b/src/basic/strv.c
@@ -253,6 +253,8 @@ char **strv_split(const char *s, const char *separator) {
         return r;
 }
 
+/// UNNEEDED by elogind
+#if 0
 char **strv_split_newlines(const char *s) {
         char **l;
         unsigned n;
@@ -277,6 +279,7 @@ char **strv_split_newlines(const char *s) {
 
         return l;
 }
+#endif // 0
 
 int strv_split_quoted(char ***t, const char *s, UnquoteFlags flags) {
         size_t n = 0, allocated = 0;
@@ -477,6 +480,8 @@ int strv_consume(char ***l, char *value) {
         return r;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int strv_consume_pair(char ***l, char *a, char *b) {
         int r;
 
@@ -488,6 +493,7 @@ int strv_consume_pair(char ***l, char *a, char *b) {
 
         return r;
 }
+#endif // 0
 
 int strv_consume_prepend(char ***l, char *value) {
         int r;
@@ -524,6 +530,8 @@ char **strv_uniq(char **l) {
         return l;
 }
 
+/// UNNEEDED by elogind
+#if 0
 bool strv_is_uniq(char **l) {
         char **i;
 
@@ -533,6 +541,7 @@ bool strv_is_uniq(char **l) {
 
         return true;
 }
+#endif // 0
 
 char **strv_remove(char **l, const char *s) {
         char **f, **t;
@@ -642,6 +651,8 @@ char **strv_sort(char **l) {
         return l;
 }
 
+/// UNNEEDED by elogind
+#if 0
 bool strv_equal(char **a, char **b) {
         if (!a || !b)
                 return a == b;
@@ -652,6 +663,7 @@ bool strv_equal(char **a, char **b) {
 
         return true;
 }
+#endif // 0
 
 void strv_print(char **l) {
         char **s;
@@ -660,6 +672,8 @@ void strv_print(char **l) {
                 puts(*s);
 }
 
+/// UNNEEDED by elogind
+#if 0
 int strv_extendf(char ***l, const char *format, ...) {
         va_list ap;
         char *x;
@@ -692,6 +706,7 @@ char **strv_reverse(char **l) {
 
         return l;
 }
+#endif // 0
 
 bool strv_fnmatch(char* const* patterns, const char *s, int flags) {
         char* const* p;