diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 18:30:10 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 18:30:10 +0200 |
| commit | 2243479b7415942604284028cd34a20aa0ba79c0 (patch) | |
| tree | 9d13b463baaccdcab307943f6896592f8385a677 /source3/lib/util_str.c | |
| parent | 6a89b59ca6187ef6e06124c2aa729be18b43bb75 (diff) | |
| parent | 4f9b6fdce4340a1022f659daaa035d0336ff6b53 (diff) | |
| download | samba-2243479b7415942604284028cd34a20aa0ba79c0.tar.gz samba-2243479b7415942604284028cd34a20aa0ba79c0.tar.bz2 samba-2243479b7415942604284028cd34a20aa0ba79c0.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/util_str.c')
| -rw-r--r-- | source3/lib/util_str.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 5d1893a85b..f6783f10ff 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -939,7 +939,7 @@ DATA_BLOB strhex_to_data_blob(TALLOC_CTX *mem_ctx, const char *strhex) * Routine to print a buffer as HEX digits, into an allocated string. */ -char *hex_encode(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len) +char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len) { int i; char *hex_buffer; @@ -1843,29 +1843,6 @@ int fstr_sprintf(fstring s, const char *fmt, ...) #define S_LIST_ABS 16 /* List Allocation Block Size */ -/** - * Return true if all the elements of the list match exactly. - **/ -bool str_list_compare(char **list1, char **list2) -{ - int num; - - if (!list1 || !list2) - return (list1 == list2); - - for (num = 0; list1[num]; num++) { - if (!list2[num]) - return false; - if (!strcsequal(list1[num], list2[num])) - return false; - } - if (list2[num]) - return false; /* if list2 has more elements than list1 fail */ - - return true; -} - - /****************************************************************************** version of standard_sub_basic() for string lists; uses talloc_sub_basic() for the work |