diff --git a/src/util-strings.c b/src/util-strings.c index ebf8e41..f3dcba2 100644 --- a/src/util-strings.c +++ b/src/util-strings.c @@ -112,53 +112,3 @@ strv_from_string(const char *in, const char *separators, size_t *num_elements) return strv; } - -/** - * Return a newly allocated string with all elements joined by the - * joiner, same as Python's string.join() basically. - * A strv of ["one", "two", "three", NULL] with a joiner of ", " results - * in "one, two, three". - * - * An empty strv ([NULL]) returns NULL, same for passing NULL as either - * argument. - * - * @param strv Input string array - * @param joiner Joiner between the elements in the final string - * - * @return A null-terminated string joining all elements - */ -char * -strv_join(char **strv, const char *joiner) -{ - char **s; - char *str; - size_t slen = 0; - size_t count = 0; - - if (!strv || !joiner) - return NULL; - - if (strv[0] == NULL) - return NULL; - - for (s = strv, count = 0; *s; s++, count++) { - slen += strlen(*s); - } - - assert(slen < 1000); - assert(strlen(joiner) < 1000); - assert(count > 0); - assert(count < 100); - - slen += (count - 1) * strlen(joiner); - - str = zalloc(slen + 1); /* trailing \0 */ - for (s = strv; *s; s++) { - strcat(str, *s); - --count; - if (count > 0) - strcat(str, joiner); - } - - return str; -} diff --git a/src/util-strings.h b/src/util-strings.h index e0b3fb9..5177d8b 100644 --- a/src/util-strings.h +++ b/src/util-strings.h @@ -194,7 +194,6 @@ safe_atod(const char *str, double *val) } char **strv_from_string(const char *in, const char *separator, size_t *num_elements); -char *strv_join(char **strv, const char *joiner); static inline void strv_free(char **strv) {