From d99b677f3501944b7aaf82375ef62a88e5fa3933 Mon Sep 17 00:00:00 2001
From: russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Wed, 10 May 2006 13:22:15 +0000
Subject: remove almost all of the checks of the result from ast_strdupa() or
 alloca(). As it turns out, all of these checks were useless, because alloca
 will never return NULL.

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@26451 f38db490-d61c-443f-a65b-d21fe96a405b
---
 apps/app_verbose.c | 57 ++++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 30 deletions(-)

(limited to 'apps/app_verbose.c')

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(&ltext, "|");
 
-- 
cgit v1.2.3