diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h index 05f24889027..d3227a2beea 100644 --- a/ctdb/include/internal/includes.h +++ b/ctdb/include/internal/includes.h @@ -67,7 +67,6 @@ double timeval_delta(struct timeval *tv2, struct timeval *tv); char **file_lines_load(const char *fname, int *numlines, TALLOC_CTX *mem_ctx); char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len); uint8_t *hex_decode_talloc(TALLOC_CTX *mem_ctx, const char *hex_in, size_t *len); -_PUBLIC_ const char **str_list_add(const char **list, const char *s); _PUBLIC_ int set_blocking(int fd, bool set); #include "lib/util/debug.h" diff --git a/ctdb/lib/util/strlist.c b/ctdb/lib/util/strlist.c deleted file mode 100644 index 48a6e45acea..00000000000 --- a/ctdb/lib/util/strlist.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - Copyright (C) Andrew Tridgell 2005 - Copyright (C) Jelmer Vernooij 2005 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . -*/ - -#include "includes.h" -#include "system/locale.h" - -/** - return the number of elements in a string list -*/ -_PUBLIC_ size_t str_list_length(const char **list) -{ - size_t ret; - for (ret=0;list && list[ret];ret++) /* noop */ ; - return ret; -} - - -/** - add an entry to a string list -*/ -_PUBLIC_ const char **str_list_add(const char **list, const char *s) -{ - size_t len = str_list_length(list); - const char **ret; - - ret = talloc_realloc(NULL, list, const char *, len+2); - if (ret == NULL) return NULL; - - ret[len] = talloc_strdup(ret, s); - if (ret[len] == NULL) return NULL; - - ret[len+1] = NULL; - - return ret; -} diff --git a/ctdb/lib/util/util.h b/ctdb/lib/util/util.h index 9929d2e7e21..49c2d5f1895 100644 --- a/ctdb/lib/util/util.h +++ b/ctdb/lib/util/util.h @@ -282,73 +282,6 @@ _PUBLIC_ void string_replace(char *s, char oldc, char newc); **/ _PUBLIC_ bool strequal(const char *s1, const char *s2); -/* The following definitions come from lib/util/util_strlist.c */ -#ifdef _SAMBA_BUILD_ - -/* separators for lists */ -#ifndef LIST_SEP -#define LIST_SEP " \t,\n\r" -#endif - -/** - build a null terminated list of strings from a input string and a - separator list. The separator list must contain characters less than - or equal to 0x2f for this to work correctly on multi-byte strings -*/ -_PUBLIC_ char **str_list_make(TALLOC_CTX *mem_ctx, const char *string, const char *sep); - -/** - * build a null terminated list of strings from an argv-like input string - * Entries are seperated by spaces and can be enclosed by quotes. - * Does NOT support escaping - */ -_PUBLIC_ const char **str_list_make_shell(TALLOC_CTX *mem_ctx, const char *string, const char *sep); - -/** - * join a list back to one string - */ -_PUBLIC_ char *str_list_join(TALLOC_CTX *mem_ctx, const char **list, char seperator); - -/** join a list back to one (shell-like) string; entries - * seperated by spaces, using quotes where necessary */ -_PUBLIC_ char *str_list_join_shell(TALLOC_CTX *mem_ctx, const char **list, char sep); - -/** - return the number of elements in a string list -*/ -_PUBLIC_ size_t str_list_length(const char * const *list); - -/** - copy a string list -*/ -_PUBLIC_ char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list); - -/** - Return true if all the elements of the list match exactly. - */ -_PUBLIC_ bool str_list_equal(const char **list1, const char **list2); - -/** - add an entry to a string list -*/ -_PUBLIC_ const char **str_list_add(const char **list, const char *s); - -/** - remove an entry from a string list -*/ -_PUBLIC_ void str_list_remove(const char **list, const char *s); - -/** - return true if a string is in a list -*/ -_PUBLIC_ bool str_list_check(const char **list, const char *s); - -/** - return true if a string is in a list, case insensitively -*/ -_PUBLIC_ bool str_list_check_ci(const char **list, const char *s); -#endif - /* The following definitions come from lib/util/util_file.c */ diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c index 015c9d10ae7..863c486bbed 100644 --- a/ctdb/tests/src/ctdb_test.c +++ b/ctdb/tests/src/ctdb_test.c @@ -84,7 +84,6 @@ struct tevent_context *tevent_context_init(TALLOC_CTX *mem_ctx); /* UTIL_OBJ */ #include "lib/util/idtree.c" #include "lib/util/db_wrap.c" -#include "lib/util/strlist.c" #include "lib/util/util.c" #include "lib/util/util_time.c" #include "lib/util/util_file.c" diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c index c20b1657ff6..8e193f78a9e 100644 --- a/ctdb/tests/src/ctdbd_test.c +++ b/ctdb/tests/src/ctdbd_test.c @@ -34,7 +34,6 @@ bool fast_start; /* UTIL_OBJ */ #include "lib/util/idtree.c" #include "lib/util/db_wrap.c" -#include "lib/util/strlist.c" #include "lib/util/util.c" #include "lib/util/util_time.c" #include "lib/util/util_file.c" diff --git a/ctdb/wscript b/ctdb/wscript index 9fc9671c6ed..7e96e78a310 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -186,7 +186,7 @@ def build(bld): bld.SAMBA_SUBSYSTEM('ctdb-util-misc', source=bld.SUBDIR('lib/util', '''db_wrap.c debug.c fault.c - idtree.c signal.c strlist.c + idtree.c signal.c substitute.c'''), includes='include include/internal lib/util', deps='replace talloc tevent tdb')