diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-13 08:36:35 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-13 08:36:35 +0000 |
commit | a41b34a63c52608e7e5c8e6aced613815461f4c2 (patch) | |
tree | 0559c99680217b78c0bda37a131b5f09794f43c6 /utils/check_expr.c | |
parent | b298a3aa9b396c4055bf75104b4fb89212c44d4a (diff) |
Merge ast_str_opaque branch (discontinue usage of ast_str internals)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@163991 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils/check_expr.c')
-rw-r--r-- | utils/check_expr.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/utils/check_expr.c b/utils/check_expr.c index ab1cee19a..1d3fcfd0e 100644 --- a/utils/check_expr.c +++ b/utils/check_expr.c @@ -27,57 +27,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define AST_API_MODULE 1 #include "asterisk/lock.h" -#include "asterisk/strings.h" - -/* I included this from utils.c, so as not to have everything in that .c - file included */ -/*! - * core handler for dynamic strings. - * This is not meant to be called directly, but rather through the - * various wrapper macros - * ast_str_set(...) - * ast_str_append(...) - * ast_str_set_va(...) - * ast_str_append_va(...) - */ -int __attribute__((format(printf, 4, 0))) __ast_str_helper(struct ast_str **buf, size_t max_len, - int append, const char *fmt, va_list ap) -{ - int res, need; - int offset = (append && (*buf)->len) ? (*buf)->used : 0; - - if (max_len < 0) - max_len = (*buf)->len; /* don't exceed the allocated space */ - /* - * Ask vsnprintf how much space we need. Remember that vsnprintf - * does not count the final '\0' so we must add 1. - */ - res = vsnprintf((*buf)->str + offset, (*buf)->len - offset, fmt, ap); - - need = res + offset + 1; - /* - * If there is not enough space and we are below the max length, - * reallocate the buffer and return a message telling to retry. - */ - if (need > (*buf)->len && (max_len == 0 || (*buf)->len < max_len) ) { - if (max_len && max_len < need) /* truncate as needed */ - need = max_len; - else if (max_len == 0) /* if unbounded, give more room for next time */ - need += 16 + need/4; - if (ast_str_make_space(buf, need)) { - return AST_DYNSTR_BUILD_FAILED; - } - (*buf)->str[offset] = '\0'; /* Truncate the partial write. */ - - /* va_end() and va_start() must be done before calling - * vsnprintf() again. */ - return AST_DYNSTR_BUILD_RETRY; - } - /* update space used, keep in mind the truncation */ - (*buf)->used = (res + offset > (*buf)->len) ? (*buf)->len : res + offset; - - return res; -} #ifndef DEBUG_THREADS enum ast_lock_type { AST_MUTEX, |