diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-01-06 19:19:17 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-01-06 19:19:17 +0000 |
commit | 1fe5108763b8a4bb9dede06afc33b5bd5266988a (patch) | |
tree | 1864ed197f7226117cb0d35e08b9dbd248135004 /utils.c | |
parent | d44823b5b8bd40eaa25d3a78aa64768993a59bee (diff) |
ensure that string field 'build' operation only evaluates arguments one time
fix some minor documentation errors
return proper type from string field space allocator
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'utils.c')
-rw-r--r-- | utils.c | 25 |
1 files changed, 23 insertions, 2 deletions
@@ -943,8 +943,8 @@ int __ast_string_field_init(struct ast_string_field_pool *pool, size_t size, return pool->base ? 0 : -1; } -char *__ast_string_field_alloc_space(struct ast_string_field_pool *pool, size_t needed, - ast_string_field *fields, int num_fields) +ast_string_field __ast_string_field_alloc_space(struct ast_string_field_pool *pool, size_t needed, + ast_string_field *fields, int num_fields) { char *result = NULL; @@ -974,3 +974,24 @@ char *__ast_string_field_alloc_space(struct ast_string_field_pool *pool, size_t pool->space -= needed; return result; } + +void __ast_string_field_index_build(struct ast_string_field_pool *pool, + ast_string_field *fields, int num_fields, + int index, const char *format, ...) +{ + char s; + size_t needed; + va_list ap1, ap2; + + va_start(ap1, format); + va_copy(ap2, ap1); + + needed = vsnprintf(&s, 1, format, ap1) + 1; + + va_end(ap1); + + if ((fields[index] = __ast_string_field_alloc_space(pool, needed, fields, num_fields))) + vsprintf((char *) fields[index], format, ap2); + + va_end(ap2); +} |