diff options
Diffstat (limited to 'apps/app_verbose.c')
| -rw-r--r-- | apps/app_verbose.c | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/apps/app_verbose.c b/apps/app_verbose.c index 02d49af62..e4ee8f068 100644 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -65,34 +65,34 @@ static int verbose_exec(struct ast_channel *chan, void *data) LOCAL_USER_ADD(u); if (data) { - if ((vtext = ast_strdupa(data))) { - char *tmp = strsep(&vtext, "|"); - if (vtext) { - if (sscanf(tmp, "%d", &vsize) != 1) { - vsize = 0; - ast_log(LOG_WARNING, "'%s' is not a verboser number\n", vtext); - } - } else { - vtext = tmp; + char *tmp; + vtext = ast_strdupa(data); + tmp = strsep(&vtext, "|"); + if (vtext) { + if (sscanf(tmp, "%d", &vsize) != 1) { vsize = 0; + ast_log(LOG_WARNING, "'%s' is not a verboser number\n", vtext); } - if (option_verbose >= vsize) { - switch (vsize) { - case 0: - ast_verbose("%s\n", vtext); - break; - case 1: - ast_verbose(VERBOSE_PREFIX_1 "%s\n", vtext); - break; - case 2: - ast_verbose(VERBOSE_PREFIX_2 "%s\n", vtext); - break; - case 3: - ast_verbose(VERBOSE_PREFIX_3 "%s\n", vtext); - break; - default: - ast_verbose(VERBOSE_PREFIX_4 "%s\n", vtext); - } + } else { + vtext = tmp; + vsize = 0; + } + if (option_verbose >= vsize) { + switch (vsize) { + case 0: + ast_verbose("%s\n", vtext); + break; + case 1: + ast_verbose(VERBOSE_PREFIX_1 "%s\n", vtext); + break; + case 2: + ast_verbose(VERBOSE_PREFIX_2 "%s\n", vtext); + break; + case 3: + ast_verbose(VERBOSE_PREFIX_3 "%s\n", vtext); + break; + default: + ast_verbose(VERBOSE_PREFIX_4 "%s\n", vtext); } } } @@ -115,10 +115,7 @@ static int log_exec(struct ast_channel *chan, void *data) return 0; } - if (!(ltext = ast_strdupa(data))) { - LOCAL_USER_REMOVE(u); - return 0; - } + ltext = ast_strdupa(data); level = strsep(<ext, "|"); |