kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@163991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-12-13 08:36:35 +00:00
parent 3b96ae826e
commit c8223fc957
53 changed files with 1264 additions and 917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
funcs/func_strings.c
View File

@@ -321,7 +321,7 @@ static int listfilter(struct ast_channel *chan, const char *cmd, char *parse, ch
);
const char *orig_list, *ptr;
const char *begin, *cur, *next;
int dlen, flen;
int dlen, flen, first = 1;
struct ast_str *result = ast_str_thread_get(&result_buf, 16);
char *delim;
@@ -385,15 +385,12 @@ static int listfilter(struct ast_channel *chan, const char *cmd, char *parse, ch
begin += flen + dlen;
} else {
/* Copy field to output */
if (result->used) {
if (!first) {
ast_str_append(&result, 0, "%s", delim);
}
/* Have to do it this way, since we're not null-terminated. */
strncpy(result->str + result->used, begin, cur - begin);
result->used += cur - begin;
result->str[result->used] = '\0';
ast_str_append_substr(&result, 0, begin, cur - begin + 1);
first = 0;
begin = cur + dlen;
}
} while (*cur != '\0');
@@ -401,7 +398,7 @@ static int listfilter(struct ast_channel *chan, const char *cmd, char *parse, ch
ast_channel_unlock(chan);
}
ast_copy_string(buf, result->str, len);
ast_copy_string(buf, ast_str_buffer(result), len);
return 0;
}