mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 04:11:08 +00:00
Merge ast_str_opaque branch (discontinue usage of ast_str internals)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@163991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1106,8 +1106,8 @@ void ast_log(int level, const char *file, int line, const char *function, const
|
||||
result = ast_str_set_va(&buf, BUFSIZ, fmt, ap); /* XXX BUFSIZ ? */
|
||||
va_end(ap);
|
||||
if (result != AST_DYNSTR_BUILD_FAILED) {
|
||||
term_filter_escapes(buf->str);
|
||||
fputs(buf->str, stdout);
|
||||
term_filter_escapes(ast_str_buffer(buf));
|
||||
fputs(ast_str_buffer(buf), stdout);
|
||||
}
|
||||
}
|
||||
return;
|
||||
@@ -1140,7 +1140,7 @@ void ast_log(int level, const char *file, int line, const char *function, const
|
||||
return;
|
||||
|
||||
/* Copy string over */
|
||||
strcpy(logmsg->str, buf->str);
|
||||
strcpy(logmsg->str, ast_str_buffer(buf));
|
||||
|
||||
/* Set type to be normal */
|
||||
logmsg->type = LOGMSG_NORMAL;
|
||||
@@ -1269,7 +1269,7 @@ void __ast_verbose_ap(const char *file, int line, const char *func, const char *
|
||||
if (!(logmsg = ast_calloc(1, sizeof(*logmsg) + res + 1)))
|
||||
return;
|
||||
|
||||
strcpy(logmsg->str, buf->str);
|
||||
strcpy(logmsg->str, ast_str_buffer(buf));
|
||||
|
||||
ast_log(__LOG_VERBOSE, file, line, func, "%s", logmsg->str + 1);
|
||||
|
||||
|
Reference in New Issue
Block a user