From: Joshua Colp <jcolp@digium.com>
Date: Mon, 16 Jul 2007 15:57:01 +0000 (+0000)
Subject: I found this sillyness when I did my ast_module_user conversion. Return immediately... 
X-Git-Tag: 1.6.0-beta1~3^2~2057
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dc98ebdf2714eb9bd8517e0c2de38d920a4ee38;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@75227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 130bfa28cc..e4808b49d9 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);
 		}
 	}