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

some simplifications to

Browse Source 
ast_dynamic_str_thread_build_va_couldnt_we_choose_a_shorter_name()

I am unsure whether the truncation of the string in case of a failed
attempt should be done unconditionally. See the XXX mark.

Russel, ideas ?



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-11-28 14:07:09 +00:00
parent 29985ff8c3
commit 5e7aebf9ac
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/utils.c
View File

@@ -975,27 +975,29 @@ int ast_get_time_t(const char *src, time_t *dst, time_t _default, int *consumed)
int ast_dynamic_str_thread_build_va(struct ast_dynamic_str **buf, size_t max_len, int ast_dynamic_str_thread_build_va(struct ast_dynamic_str **buf, size_t max_len,
struct ast_threadstorage *ts, int append, const char *fmt, va_list ap) struct ast_threadstorage *ts, int append, const char *fmt, va_list ap)
{ {
int res; int res, need;
int offset = (append && (*buf)->len) ? strlen((*buf)->str) : 0; int offset = (append && (*buf)->len) ? strlen((*buf)->str) : 0;
res = vsnprintf((*buf)->str + offset, (*buf)->len - offset, fmt, ap); res = vsnprintf((*buf)->str + offset, (*buf)->len - offset, fmt, ap);
need = res + offset + 1;
/* Check to see if there was not enough space in the string buffer to prepare /* Check to see if there was not enough space in the string buffer to prepare
* the string. Also, if a maximum length is present, make sure the current * the string. Also, if a maximum length is present, make sure the current
* length is less than the maximum before increasing the size. */ * length is less than the maximum before increasing the size. */
if ((res + offset + 1) > (*buf)->len && (max_len ? ((*buf)->len < max_len) : 1)) { if (need > (*buf)->len && (max_len == 0 || (*buf)->len < max_len) ) {
/* Set the new size of the string buffer to be the size needed /* Set the new size of the string buffer to be the size needed
* to hold the resulting string (res) plus one byte for the * to hold the resulting string (res) plus one byte for the
* terminating '\0'. If this size is greater than the max, set * terminating '\0'. If this size is greater than the max, set
* the new length to be the maximum allowed. */ * the new length to be the maximum allowed. */
if (max_len) if (max_len && max_len < need)
(*buf)->len = ((res + offset + 1) < max_len) ? (res + offset + 1) : max_len; need = max_len;
else
(*buf)->len = res + offset + 1;
if (!(*buf = ast_realloc(*buf, (*buf)->len + sizeof(*(*buf))))) *buf = ast_realloc(*buf, need + sizeof(struct ast_dynamic_str));
if (*buf == NULL)
return AST_DYNSTR_BUILD_FAILED; return AST_DYNSTR_BUILD_FAILED;
(*buf)->len = need;
/* Truncate the previous attempt. XXX this should be unconditional */
if (append) if (append)
(*buf)->str[offset] = '\0'; (*buf)->str[offset] = '\0';