From 060022b4b3d2ad09a2c6083d005a96054096dfc6 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 16 Apr 2025 12:55:43 +0200 Subject: [PATCH] (!69) util-strings: drop unused strv_join() Not used anywhere. Signed-off-by: Enrico Weigelt, metux IT consult --- src/util-strings.c | 50 ---------------------------------------------- src/util-strings.h | 1 - 2 files changed, 51 deletions(-) diff --git a/src/util-strings.c b/src/util-strings.c index 8188774..69bf4f0 100644 --- a/src/util-strings.c +++ b/src/util-strings.c @@ -114,53 +114,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 0b37f3a..c8d609b 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) {