diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dumpchan.c | 20 | ||||
| -rw-r--r-- | apps/app_verbose.c | 24 |
2 files changed, 13 insertions, 31 deletions
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c index 18dfb96d0..f1a66ffb0 100644 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -183,17 +183,15 @@ static int dumpchan_exec(struct ast_channel *chan, const char *data) if (!ast_strlen_zero(data)) level = atoi(data); - if (option_verbose >= level) { - serialize_showchan(chan, info, sizeof(info)); - pbx_builtin_serialize_variables(chan, &vars); - ast_verbose("\n" - "Dumping Info For Channel: %s:\n" - "%s\n" - "Info:\n" - "%s\n" - "Variables:\n" - "%s%s\n", ast_channel_name(chan), line, info, ast_str_buffer(vars), line); - } + serialize_showchan(chan, info, sizeof(info)); + pbx_builtin_serialize_variables(chan, &vars); + ast_verb(level, "\n" + "Dumping Info For Channel: %s:\n" + "%s\n" + "Info:\n" + "%s\n" + "Variables:\n" + "%s%s\n", ast_channel_name(chan), line, info, ast_str_buffer(vars), line); return 0; } diff --git a/apps/app_verbose.c b/apps/app_verbose.c index b981fb9c8..394c48991 100644 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -63,7 +63,7 @@ static char *app_log = "Log"; <syntax> <parameter name="level" required="true"> <para>Level must be one of <literal>ERROR</literal>, <literal>WARNING</literal>, <literal>NOTICE</literal>, - <literal>DEBUG</literal>, <literal>VERBOSE</literal> or <literal>DTMF</literal>.</para> + <literal>DEBUG</literal>, <literal>VERBOSE</literal> or <literal>DTMF</literal>.</para> </parameter> <parameter name="message" required="true"> <para>Output text message.</para> @@ -100,24 +100,8 @@ static int verbose_exec(struct ast_channel *chan, const char *data) vsize = 0; ast_log(LOG_WARNING, "'%s' is not a verboser number\n", args.level); } - if (option_verbose >= vsize) { - switch (vsize) { - case 0: - ast_verb(0, "%s\n", args.msg); - break; - case 1: - ast_verb(1, "%s\n", args.msg); - break; - case 2: - ast_verb(2, "%s\n", args.msg); - break; - case 3: - ast_verb(3, "%s\n", args.msg); - break; - default: - ast_verb(4, "%s\n", args.msg); - } - } + + ast_verb(vsize, "%s\n", args.msg); return 0; } @@ -171,7 +155,7 @@ static int unload_module(void) res = ast_unregister_application(app_verbose); res |= ast_unregister_application(app_log); - return res; + return res; } static int load_module(void) |