lib/strutils: add ul_ prefix to split() function

Addresses: https://github.com/util-linux/util-linux/issues/3626
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 6b627aa34d2977eb347b32040c1c3075daad3d1d)

diff --git a/include/strutils.h b/include/strutils.h
index a21ff7c50aea207262e314ef11ff10d1c6f90672..c8c616f7bf7d57dfdd9a57d228f391c2f22cd484 100644 (file)
--- a/include/strutils.h
+++ b/include/strutils.h
@@ -452,7 +452,7 @@ extern int strfappend(char **a, const char *format, ...)
 extern int ul_strvfappend(char **a, const char *format, va_list ap)
                 __attribute__ ((__format__ (__printf__, 2, 0)));
 
-extern const char *split(const char **state, size_t *l, const char *separator, int quoted);
+extern const char *ul_split(const char **state, size_t *l, const char *separator, int quoted);
 
 extern char *ul_strchr_escaped(const char *s, int c);
 

diff --git a/lib/strutils.c b/lib/strutils.c
index 859b9049498f32336bd0b5dcb33e908dff60cdde..54746fcae6dd976f0e1ae48cf4a8ff82f8364461 100644 (file)
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -1109,7 +1109,7 @@ char *ul_strchr_escaped(const char *s, int c)
 }
 
 /* Split a string into words. */
-const char *split(const char **state, size_t *l, const char *separator, int quoted)
+const char *ul_split(const char **state, size_t *l, const char *separator, int quoted)
 {
         const char *current;
 

diff --git a/lib/strv.c b/lib/strv.c
index bd006e353a8103a76bdf137980caf10a3a63722c..6da638c1a26d655b5db83e50f88fb61f66d38855 100644 (file)
--- a/lib/strv.c
+++ b/lib/strv.c
@@ -180,7 +180,7 @@ int ul_strv_extend_strv_concat(char ***a, char **b, const char *suffix) {
 
 
 #define _FOREACH_WORD(word, length, s, separator, quoted, state)        \
-        for ((state) = (s), (word) = split(&(state), &(length), (separator), (quoted)); (word); (word) = split(&(state), &(length), (separator), (quoted)))
+        for ((state) = (s), (word) = ul_split(&(state), &(length), (separator), (quoted)); (word); (word) = ul_split(&(state), &(length), (separator), (quoted)))
 
 #define FOREACH_WORD_SEPARATOR(word, length, s, separator, state)       \
         _FOREACH_WORD(word, length, s, separator, false, state)