diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2018-02-19 19:55:50 -0600 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2018-03-01 13:13:55 -0600 |
| commit | c711e4076a6913e18e27a694bcb3fb721822fb58 (patch) | |
| tree | 57d414b30a6ac76408ea8831c071ce54ffc428d4 /main/strings.c | |
| parent | e58ae393b1f83981178c7ddedf4cfb40e6ca5f31 (diff) | |
core: Remove ABI effects of MALLOC_DEBUG.
This allows asterisk to be compiled with MALLOC_DEBUG to load modules
built without MALLOC_DEBUG. Now pre-compiled third-party modules will
still work regardless of MALLOC_DEBUG being enabled or not.
Change-Id: Ic07ad80b2c2df894db984cf27b16a69383ce0e10
Diffstat (limited to 'main/strings.c')
| -rw-r--r-- | main/strings.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/main/strings.c b/main/strings.c index ad96df249..640af6123 100644 --- a/main/strings.c +++ b/main/strings.c @@ -52,13 +52,9 @@ * ast_str_append_va(...) */ -#ifdef __AST_DEBUG_MALLOC -int __ast_debug_str_helper(struct ast_str **buf, ssize_t max_len, - int append, const char *fmt, va_list ap, const char *file, int lineno, const char *function) -#else int __ast_str_helper(struct ast_str **buf, ssize_t max_len, - int append, const char *fmt, va_list ap) -#endif + int append, const char *fmt, va_list ap, + const char *file, int lineno, const char *function) { int res; int added; @@ -110,13 +106,7 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len, need = max_len; } - if ( -#ifdef __AST_DEBUG_MALLOC - _ast_str_make_space(buf, need, file, lineno, function) -#else - ast_str_make_space(buf, need) -#endif - ) { + if (_ast_str_make_space(buf, need, file, lineno, function)) { ast_log_safe(LOG_VERBOSE, "failed to extend from %d to %d\n", (int) (*buf)->__AST_STR_LEN, need); |