diff options
| author | Matthew Jordan <mjordan@digium.com> | 2011-12-12 19:35:08 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2011-12-12 19:35:08 +0000 |
| commit | 9057aa20b6b822d3c14c241bea9709e6b61d7dbe (patch) | |
| tree | 6445c15c9eff3077dbd60ae7414b3583b1275acb /utils | |
| parent | e2597678b1bf10bb2ea2fac9cd6c3bd6e53e5b46 (diff) | |
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
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ael_main.c | 2 | ||||
| -rw-r--r-- | utils/hashtest.c | 2 | ||||
| -rw-r--r-- | utils/hashtest2.c | 2 | ||||
| -rw-r--r-- | utils/refcounter.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/utils/ael_main.c b/utils/ael_main.c index d3a23382a..52aa47993 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -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); diff --git a/utils/hashtest.c b/utils/hashtest.c index c06d4ac0a..390e331e0 100644 --- a/utils/hashtest.c +++ b/utils/hashtest.c @@ -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); diff --git a/utils/hashtest2.c b/utils/hashtest2.c index 47397101e..5bc628061 100644 --- a/utils/hashtest2.c +++ b/utils/hashtest2.c @@ -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); diff --git a/utils/refcounter.c b/utils/refcounter.c index 58cfa0de2..b45680e0d 100644 --- a/utils/refcounter.c +++ b/utils/refcounter.c @@ -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); |