sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

ctdb-util: Remove util/strlist.c and references to str_util_*()

Browse Source 
They're not used in CTDB.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2014-09-04 12:34:46 +10:00 committed by Amitay Isaacs
parent b0f9d33058
commit 5de4a97fe9
6 changed files with 1 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ctdb/include/internal/includes.h
View File

@ -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"

52
ctdb/lib/util/strlist.c
View File

@ -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;
}

67
ctdb/lib/util/util.h
View File

@ -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 */

1
ctdb/tests/src/ctdb_test.c
View File

@ -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"

1
ctdb/tests/src/ctdbd_test.c
View File

@ -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"

2
ctdb/wscript
View File

@ -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')