diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-12 05:47:37 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-12 05:47:37 +0000 |
| commit | eb835c92bda732ed2a23c366bc0ebb5f0cd34f70 (patch) | |
| tree | fb14f1e7e12f683617214a565b630d739205819e /apps | |
| parent | ae8bf4ebab54e081f4365c1afeaad1e378951c3f (diff) | |
Merged revisions 107960 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r107960 | tilghman | 2008-03-12 00:46:39 -0500 (Wed, 12 Mar 2008) | 4 lines
Revert several changes from revision 102525, as the changes were not
compatible, and, in fact, introduced regressions.
(Closes issue #12190)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107961 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dumpchan.c | 4 | ||||
| -rw-r--r-- | apps/app_zapras.c | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c index 17948af9a..37e040e9b 100644 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -141,8 +141,8 @@ static int dumpchan_exec(struct ast_channel *chan, void *data) pbx_builtin_serialize_variables(chan, &vars); serialize_showchan(chan, info, sizeof(info)); - if (level > 0) - ast_verb(level, "\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n", chan->name, line, info, vars->str, line); + if (option_verbose >= level) + ast_verbose("\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n", chan->name, line, info, vars->str, line); return 0; } diff --git a/apps/app_zapras.c b/apps/app_zapras.c index 31f208d22..231a9f2a6 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -165,13 +165,14 @@ static void run_ras(struct ast_channel *chan, char *args) if (res < 0) { ast_log(LOG_WARNING, "wait4 returned %d: %s\n", res, strerror(errno)); } - if (WIFEXITED(status)) + if (WIFEXITED(status)) { ast_verb(3, "RAS on %s terminated with status %d\n", chan->name, WEXITSTATUS(status)); - else if (WIFSIGNALED(status)) - ast_verb(3, "RAS on %s terminated with signal %d\n", chan->name, WTERMSIG(status)); - else - ast_verbose(VERBOSE_PREFIX_3 "RAS on %s terminated weirdly.\n", chan->name); - + } else if (WIFSIGNALED(status)) { + ast_verb(3, "RAS on %s terminated with signal %d\n", + chan->name, WTERMSIG(status)); + } else { + ast_verb(3, "RAS on %s terminated weirdly.\n", chan->name); + } /* Throw back into audio mode */ x = 1; ioctl(chan->fds[0], ZT_AUDIOMODE, &x); |