From ff8346d06e8f26212920c5554023f6d7ef4e228d Mon Sep 17 00:00:00 2001 From: file Date: Mon, 16 Jul 2007 15:57:01 +0000 Subject: I found this sillyness when I did my ast_module_user conversion. Return immediately if no data was passed to the Verbose application. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75227 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_verbose.c | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'apps') diff --git a/apps/app_verbose.c b/apps/app_verbose.c index 130bfa28c..e4808b49d 100644 --- a/apps/app_verbose.c +++ b/apps/app_verbose.c @@ -54,39 +54,39 @@ static char *log_descrip = static int verbose_exec(struct ast_channel *chan, void *data) { - char *vtext; + char *vtext, *tmp; int vsize; - if (data) { - 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); - } - } else { - vtext = tmp; + if (ast_strlen_zero(data)) + return 0; + + 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); } } -- cgit v1.2.3