kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use va_copy for stringfields

Browse Source 
The ast_string_field_build_va functions were written to take to separate
va_lists to work around FreeBSD 4 not having va_copy defined.

In the end, we don't support anything using gcc < 3 anyway because we use
va_copy all over the place anyway. This patch just simplifies things by
removing the second va_list function arguments in favor of va_copy.

Review: https://reviewboard.asterisk.org/r/1233/
--This line, and those below, will be ignored--

M    include/asterisk/stringfields.h
M    main/utils.c
M    main/channel.c


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2011-05-26 15:55:22 +00:00
parent dbfac9cb55
commit fc8d4e823c
3 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main/utils.c
View File

@@ -1733,13 +1733,14 @@ void __ast_string_field_release_active(struct ast_string_field_pool *pool_head,
void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr,
struct ast_string_field_pool **pool_head,
ast_string_field *ptr, const char *format, va_list ap1, va_list ap2)
ast_string_field *ptr, const char *format, va_list ap)
{
size_t needed;
size_t available;
size_t space = (*pool_head)->size - (*pool_head)->used;
ssize_t grow;
char *target;
va_list ap2;
/* if the field already has space allocated, try to reuse it;
otherwise, try to use the empty space at the end of the current
@@ -1762,9 +1763,9 @@ void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr,
available = space - sizeof(ast_string_field_allocation);
}
needed = vsnprintf(target, available, format, ap1) + 1;
va_end(ap1);
va_copy(ap2, ap);
needed = vsnprintf(target, available, format, ap2) + 1;
va_end(ap2);
if (needed > available) {
/* the allocation could not be satisfied using the field's current allocation
@@ -1774,7 +1775,8 @@ void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr,
if (!(target = (char *) __ast_string_field_alloc_space(mgr, pool_head, needed))) {
return;
}
vsprintf(target, format, ap2);
vsprintf(target, format, ap);
va_end(ap);
__ast_string_field_release_active(*pool_head, *ptr);
*ptr = target;
} else if (*ptr != target) {
@@ -1800,15 +1802,11 @@ void __ast_string_field_ptr_build(struct ast_string_field_mgr *mgr,
struct ast_string_field_pool **pool_head,
ast_string_field *ptr, const char *format, ...)
{
va_list ap1, ap2;
va_list ap;
va_start(ap1, format);
va_start(ap2, format); /* va_copy does not exist on FreeBSD */
__ast_string_field_ptr_build_va(mgr, pool_head, ptr, format, ap1, ap2);
va_end(ap1);
va_end(ap2);
va_start(ap, format);
__ast_string_field_ptr_build_va(mgr, pool_head, ptr, format, ap);
va_end(ap);
}
void *__ast_calloc_with_stringfields(unsigned int num_structs, size_t struct_size, size_t field_mgr_offset,