diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-03-12 05:46:39 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-03-12 05:46:39 +0000 |
| commit | 10609251f9462c11cc98c58a2c7b3fd6507cbeee (patch) | |
| tree | 82ec307a0338e96f20c3a3a136774ef28b4dc0c2 /apps | |
| parent | b7f064eb244a189f3efff4ab2f907c9e7d31f368 (diff) | |
Revert several changes from revision 102525, as the changes were not
compatible, and, in fact, introduced regressions.
(Closes issue #12190)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107960 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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); |