strv: Reduce transitive includes

src/basic/conf-files.c

@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "conf-files.h"
 #include "constants.h"

src/basic/glyph-util.c

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
+
 #include "env-util.h"
 #include "glyph-util.h"
 #include "locale-util.h"

src/basic/log-context.c

@@ -6,6 +6,7 @@
 #include "iovec-util.h"
 #include "log.h"
 #include "log-context.h"
+#include "string-util.h"
 #include "strv.h"
 
 static int saved_log_context_enabled = -1;

src/basic/log.c

@@ -21,6 +21,7 @@
 #include "argv-util.h"
 #include "env-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "iovec-util.h"

src/basic/nulstr-util.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "nulstr-util.h"
 #include "string-util.h"
 #include "strv.h"

src/basic/strv.c

@@ -405,6 +405,15 @@ int strv_split_newlines_full(char ***ret, const char *s, ExtractFlags flags) {
         return n;
 }
 
+char** strv_split_newlines(const char *s) {
+        char **ret;
+
+        if (strv_split_newlines_full(&ret, s, 0) < 0)
+                return NULL;
+
+        return ret;
+}
+
 int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags) {
         _cleanup_strv_free_ char **l = NULL;
         size_t n = 0;
@@ -440,6 +449,15 @@ int strv_split_full(char ***t, const char *s, const char *separators, ExtractFla
         return (int) n;
 }
 
+char** strv_split(const char *s, const char *separators) {
+        char **ret;
+
+        if (strv_split_full(&ret, s, separators, EXTRACT_RETAIN_ESCAPE) < 0)
+                return NULL;
+
+        return ret;
+}
+
 int strv_split_and_extend_full(char ***t, const char *s, const char *separators, bool filter_duplicates, ExtractFlags flags) {
         char **l;
         int r;
@@ -458,6 +476,10 @@ int strv_split_and_extend_full(char ***t, const char *s, const char *separators,
         return (int) strv_length(*t);
 }
 
+int strv_split_and_extend(char ***t, const char *s, const char *separators, bool filter_duplicates) {
+        return strv_split_and_extend_full(t, s, separators, filter_duplicates, 0);
+}
+
 int strv_split_colon_pairs(char ***t, const char *s) {
         _cleanup_strv_free_ char **l = NULL;
         size_t n = 0;

src/basic/strv.h

@@ -1,17 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <fnmatch.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 
 #include "alloc-util.h"
-#include "extract-word.h"
 #include "hashmap.h"
-#include "macro.h"
-#include "string-util.h"
+#include "memory-util.h"
+
+typedef enum ExtractFlags ExtractFlags;
 
 char* strv_find(char * const *l, const char *name) _pure_;
 char* strv_find_case(char * const *l, const char *name) _pure_;
@@ -113,27 +112,13 @@ static inline bool strv_isempty(char * const *l) {
 }
 
 int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags);
-static inline char** strv_split(const char *s, const char *separators) {
-        char **ret;
-
-        if (strv_split_full(&ret, s, separators, EXTRACT_RETAIN_ESCAPE) < 0)
-                return NULL;
-
-        return ret;
-}
+char** strv_split(const char *s, const char *separators);
 
 int strv_split_and_extend_full(char ***t, const char *s, const char *separators, bool filter_duplicates, ExtractFlags flags);
-#define strv_split_and_extend(t, s, sep, dup) strv_split_and_extend_full(t, s, sep, dup, 0)
+int strv_split_and_extend(char ***t, const char *s, const char *separators, bool filter_duplicates);
 
 int strv_split_newlines_full(char ***ret, const char *s, ExtractFlags flags);
-static inline char** strv_split_newlines(const char *s) {
-        char **ret;
-
-        if (strv_split_newlines_full(&ret, s, 0) < 0)
-                return NULL;
-
-        return ret;
-}
+char** strv_split_newlines(const char *s);
 
 /* Given a string containing white-space separated tuples of words themselves separated by ':',
  * returns a vector of strings. If the second element in a tuple is missing, the corresponding

src/basic/terminal-util.c

@@ -27,6 +27,7 @@
 #include "devnum-util.h"
 #include "env-util.h"
 #include "errno-list.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/time-util.c

@@ -13,6 +13,7 @@
 
 #include "alloc-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

src/basic/user-util.c

@@ -16,6 +16,7 @@
 #include "alloc-util.h"
 #include "chase.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"