sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

Remove tok pstring from util_str.c

Browse Source 
Do we even make rpctorture anymore ?
Jeremy.
(This used to be commit fecc3cc45a)
This commit is contained in:
Jeremy Allison
2007-12-04 17:23:19 -08:00
parent 755051b569
commit 74dfee916f
2 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/util_str.c
View File

@ -2053,7 +2053,8 @@ static char **str_list_make_internal(TALLOC_CTX *mem_ctx,
const char *str;
char *s;
int num, lsize;
pstring tok;
char *tok;
TALLOC_CTX *frame = NULL;
if (!string || !*string)
return NULL;
@ -2072,7 +2073,8 @@ static char **str_list_make_internal(TALLOC_CTX *mem_ctx,
list = NULL;
str = s;
while (next_token(&str, tok, sep, sizeof(tok))) {
frame = talloc_stackframe();
while (next_token_talloc(frame, &str, &tok, sep)) {
if (num == lsize) {
lsize += S_LIST_ABS;
if (mem_ctx) {
@ -2094,6 +2096,7 @@ static char **str_list_make_internal(TALLOC_CTX *mem_ctx,
} else {
SAFE_FREE(s);
}
TALLOC_FREE(frame);
return NULL;
} else {
list = rlist;
@ -2116,12 +2119,15 @@ static char **str_list_make_internal(TALLOC_CTX *mem_ctx,
} else {
SAFE_FREE(s);
}
TALLOC_FREE(frame);
return NULL;
}
num++;
}
TALLOC_FREE(frame);
if (mem_ctx) {
TALLOC_FREE(s);
} else {