Backed out core changes from r346391

During testing, it was discovered that there were a number of side effects
introduced by r346391 and subsequent check-ins related to it (r346429,
r346617, and r346655).  This included the /main/stdtime/ test 'hanging',
as well as the remote console option failing to receive the appropriate output
after a period of time.

I only backed out the changes to main/ and utils/, as this was adequate
to reverse the behavior experienced.

(issue ASTERISK-18974)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@347997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2011-12-12 19:35:08 +00:00
parent e2597678b1
commit 9057aa20b6
13 changed files with 100 additions and 213 deletions

View File

@@ -122,7 +122,7 @@ void ast_cli_unregister_multiple(void);
void ast_context_destroy(void);
void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...);
char *ast_process_quotes_and_slashes(char *start, char find, char replace_with);
void __ast_verbose(const char *file, int line, const char *func, int level, const char *fmt, ...);
void __ast_verbose(const char *file, int line, const char *func, const char *fmt, ...);
struct ast_app *pbx_findapp(const char *app);
void filter_leading_space_from_exprs(char *str);
void filter_newlines(char *str);

View File

@@ -356,7 +356,7 @@ void ast_log(int level, const char *file, int line, const char *function, const
va_end(vars);
}
void __ast_verbose(const char *file, int line, const char *func, int level, const char *fmt, ...)
void __ast_verbose(const char *file, int line, const char *func, const char *fmt, ...)
{
va_list vars;
va_start(vars,fmt);

View File

@@ -368,7 +368,7 @@ void ast_log(int level, const char *file, int line, const char *function, const
va_end(vars);
}
void __ast_verbose(const char *file, int line, const char *func, int level, const char *fmt, ...)
void __ast_verbose(const char *file, int line, const char *func, const char *fmt, ...)
{
va_list vars;
va_start(vars,fmt);

View File

@@ -259,7 +259,7 @@ void ast_log(int level, const char *file, int line, const char *function, const
va_end(vars);
}
void __ast_verbose(const char *file, int line, const char *func, int level, const char *fmt, ...)
void __ast_verbose(const char *file, int line, const char *func, const char *fmt, ...)
{
va_list vars;
va_start(vars,fmt);