remove lots of useless checks of the result of ast_strdupa

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8379 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 24 insertions, 33 deletions

diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 4ec4839d7..4b7a54b0e 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -67,38 +67,34 @@ static int verbose_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 
 	if (data) {
-		vtext = ast_strdupa((char *)data);
+		vtext = ast_strdupa(data);
+		char *tmp = strsep(&vtext, "|,");
 		if (vtext) {
-			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;
+			if (sscanf(tmp, "%d", &vsize) != 1) {
 				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);
-				}
+				ast_log(LOG_WARNING, "'%s' is not a verboser number\n", vtext);
 			}
 		} else {
-			ast_log(LOG_ERROR, "Out of memory\n");
+			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);
+			}
 		}
 	}
 
@@ -121,11 +117,6 @@ static int log_exec(struct ast_channel *chan, void *data)
 	}
 
 	ltext = ast_strdupa(data);
-	if (!ltext) {
-		ast_log(LOG_ERROR, "Out of memory\n");
-		LOCAL_USER_REMOVE(u);
-		return 0;
-	}
 
 	level = strsep(&ltext, "|");