summaryrefslogtreecommitdiffstats
path: root/ctdb/lib
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-09-04 12:34:46 +1000
committerAmitay Isaacs <amitay@samba.org>2014-09-10 01:36:14 +0200
commit5de4a97fe941c27080061480cdd7ed8f60f4438e (patch)
tree3290763dd2f1ff4ad6aba62cbc5f35a4322cc90a /ctdb/lib
parentb0f9d3305850bdcce171b53e7bbbc9628a4e3c20 (diff)
downloadsamba-5de4a97fe941c27080061480cdd7ed8f60f4438e.tar.gz
samba-5de4a97fe941c27080061480cdd7ed8f60f4438e.tar.xz
samba-5de4a97fe941c27080061480cdd7ed8f60f4438e.zip
ctdb-util: Remove util/strlist.c and references to str_util_*()
They're not used in CTDB. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/lib')
-rw-r--r--ctdb/lib/util/strlist.c52
-rw-r--r--ctdb/lib/util/util.h67
2 files changed, 0 insertions, 119 deletions
diff --git a/ctdb/lib/util/strlist.c b/ctdb/lib/util/strlist.c
deleted file mode 100644
index 48a6e45ace..0000000000
--- 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 <http://www.gnu.org/licenses/>.
-*/
-
-#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 9929d2e7e2..49c2d5f189 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 */