From 57fa96b47654e899808b5159579b46f4059b5971 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 15 Oct 2019 10:15:41 +0200 Subject: [PATCH] s3:lib: remove unused str_list_substitute() Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- source3/include/proto.h | 1 - source3/lib/util_str.c | 74 ----------------------------------------- 2 files changed, 75 deletions(-) diff --git a/source3/include/proto.h b/source3/include/proto.h index bf0ea06aa9e..c097ab19d14 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -620,7 +620,6 @@ size_t strlen_m(const char *s); size_t strlen_m_term(const char *s); size_t strlen_m_term_null(const char *s); int fstr_sprintf(fstring s, const char *fmt, ...); -bool str_list_substitute(char **list, const char *pattern, const char *insert); char *ipstr_list_make(char **ipstr_list, const struct ip_service *ip_list, diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index e660e295c33..5d1d1291011 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -570,80 +570,6 @@ int fstr_sprintf(fstring s, const char *fmt, ...) return ret; } -/** - List of Strings manipulation functions -**/ - -#define S_LIST_ABS 16 /* List Allocation Block Size */ - -/****************************************************************************** - substitute a specific pattern in a string list - *****************************************************************************/ - -bool str_list_substitute(char **list, const char *pattern, const char *insert) -{ - TALLOC_CTX *ctx = list; - char *p, *s, *t; - ssize_t ls, lp, li, ld, i, d; - - if (!list) - return false; - if (!pattern) - return false; - if (!insert) - return false; - - lp = (ssize_t)strlen(pattern); - li = (ssize_t)strlen(insert); - ld = li -lp; - - while (*list) { - s = *list; - ls = (ssize_t)strlen(s); - - while ((p = strstr_m(s, pattern))) { - t = *list; - d = p -t; - if (ld) { - t = talloc_array(ctx, char, ls +ld +1); - if (!t) { - DEBUG(0,("str_list_substitute: " - "Unable to allocate memory")); - return false; - } - memcpy(t, *list, d); - memcpy(t +d +li, p +lp, ls -d -lp +1); - TALLOC_FREE(*list); - *list = t; - ls += ld; - s = t +d +li; - } - - for (i = 0; i < li; i++) { - switch (insert[i]) { - case '`': - case '"': - case '\'': - case ';': - case '$': - case '%': - case '\r': - case '\n': - t[d +i] = '_'; - break; - default: - t[d +i] = insert[i]; - } - } - } - - list++; - } - - return true; -} - - #define IPSTR_LIST_SEP "," #define IPSTR_LIST_CHAR ',' -- 2.47.3