summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-09-24 15:42:36 -0700
committerJeremy Allison <jra@samba.org>2009-09-24 15:42:36 -0700
commit4f10aa59730b44fc4328daca3e2e43693fc1b69f (patch)
tree27d19f3779d19f8941d1fdebbda67264cf2674b6 /source3/lib
parentb39c390280d1f268e2550c731057aec550a3f086 (diff)
downloadsamba-4f10aa59730b44fc4328daca3e2e43693fc1b69f.tar.gz
samba-4f10aa59730b44fc4328daca3e2e43693fc1b69f.tar.bz2
samba-4f10aa59730b44fc4328daca3e2e43693fc1b69f.zip
Revert 918b5a7e057bd91289ec06b3ef8d95da43a50ede. This code
should *not* return const. Jeremy.
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/util_str.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 2136388eb4..9a0b12adea 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -2430,10 +2430,10 @@ char *escape_shell_string(const char *src)
#define S_LIST_ABS 16 /* List Allocation Block Size */
-const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
+char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
const char *sep)
{
- const char **list;
+ char **list;
const char *str;
char *s, *tok;
int num, lsize;
@@ -2441,7 +2441,7 @@ const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
if (!string || !*string)
return NULL;
- list = TALLOC_ARRAY(mem_ctx, const char *, S_LIST_ABS+1);
+ list = TALLOC_ARRAY(mem_ctx, char *, S_LIST_ABS+1);
if (list == NULL) {
return NULL;
}
@@ -2461,11 +2461,11 @@ const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
while (next_token_talloc(list, &str, &tok, sep)) {
if (num == lsize) {
- const char **tmp;
+ char **tmp;
lsize += S_LIST_ABS;
- tmp = TALLOC_REALLOC_ARRAY(mem_ctx, list, const char *,
+ tmp = TALLOC_REALLOC_ARRAY(mem_ctx, list, char *,
lsize + 1);
if (tmp == NULL) {
DEBUG(0,("str_list_make: "
@@ -2477,7 +2477,7 @@ const char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
list = tmp;
memset (&list[num], 0,
- ((sizeof(const char**)) * (S_LIST_ABS +1)));
+ ((sizeof(char**)) * (S_LIST_ABS +1)));
}
list[num] = tok;