on this pass, only remove duplicate log messages

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

8 files changed, 15 insertions, 54 deletions

diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index c5cadc758..4922b9a93 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -63,11 +63,8 @@ static char *builtin_function_cdr_read(struct ast_channel *chan, char *cmd, char
 	if (!chan->cdr)
 		return NULL;
 
-	parse = ast_strdupa(data);
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(parse = ast_strdupa(data)))
 		return NULL;
-	}
 
 	AST_STANDARD_APP_ARGS(args, parse);
 	
@@ -92,11 +89,8 @@ static void builtin_function_cdr_write(struct ast_channel *chan, char *cmd, char
 	if (ast_strlen_zero(data) || !value)
 		return;
 	
-	parse = ast_strdupa(data);
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(parse = ast_strdupa(data)))
 		return;
-	}
 
 	AST_STANDARD_APP_ARGS(args, parse);
 
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 1df47030e..9064b1e68 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -83,10 +83,8 @@ static int sort_internal(struct ast_channel *chan, char *data, char *buffer, siz
 		return ERROR_NOARG;
 	}
 
-	strings = ast_strdupa((char *)data);
-	if (!strings) {
+	if (!(strings = ast_strdupa(data)))
 		return ERROR_NOMEM;
-	}
 
 	for (ptrkey = strings; *ptrkey; ptrkey++) {
 		if (*ptrkey == '|') {
@@ -142,11 +140,8 @@ static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size
 
 	memset(buffer, 0, buflen); 
 	
-	parse = ast_strdupa(data);
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(parse = ast_strdupa(data)))
 		return ERROR_NOMEM;
-	}
 
 	AST_STANDARD_APP_ARGS(args, parse);
 
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index d1d96abf3..642a4d45c 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -55,10 +55,8 @@ static char *builtin_function_iftime(struct ast_channel *chan, char *cmd, char *
 	char *iftrue;
 	char *iffalse;
 
-	if (!(data = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
+	if (!(data = ast_strdupa(data)))
 		return NULL;
-	}
 
 	data = ast_strip_quoted(data, "\"", "\"");
 	expr = strsep(&data, "?");
@@ -95,10 +93,8 @@ static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data
 	char *iftrue;
 	char *iffalse;
 
-	if (!(data = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
+	if (!(data = ast_strdupa(data)))
 		return NULL;
-	}
 
 	data = ast_strip_quoted(data, "\"", "\"");
 	expr = strsep(&data, "?");
@@ -129,10 +125,8 @@ static char *builtin_function_set(struct ast_channel *chan, char *cmd, char *dat
 	char *varname;
 	char *val;
 
-	if (!(data = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
+	if (!(data = ast_strdupa(data)))
 		return NULL;
-	}
 
 	varname = strsep(&data, "=");
 	val = data;
diff --git a/funcs/func_math.c b/funcs/func_math.c
index d086fe304..ebd7a707b 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -88,11 +88,8 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da
 		return NULL;
 	}
 
-	parse = ast_strdupa(data);
-	if(!parse) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(parse = ast_strdupa(data)))
 		return NULL;
-	}
 
 	AST_STANDARD_APP_ARGS(args, parse);
 	
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index 552e876ed..467799d0c 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -67,11 +67,8 @@ static char *builtin_function_checkmd5(struct ast_channel *chan, char *cmd, char
 		return NULL;
 	}
 
-	parse = ast_strdupa(data);
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(parse = ast_strdupa(data)))
 		return NULL;
-	}
 	
 	AST_STANDARD_APP_ARGS(args, parse);
 	
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 3e0f52fea..f7f7637b3 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -265,9 +265,7 @@ static char *acf_odbc_read(struct ast_channel *chan, char *cmd, char *data, char
 #endif
 
 	/* Parse our arguments */
-	s = ast_strdupa(data);
-	if (!s) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(s = ast_strdupa(data))) {
 		ast_mutex_unlock(&query_lock);
 		return "";
 	}
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index dbd82c941..0f1bd0068 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -56,7 +56,6 @@ static char *acf_rand_exec(struct ast_channel *chan, char *cmd, char *data, char
 	LOCAL_USER_ACF_ADD(u);
 
 	if (!(s = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Out of memory\n");
 		*buffer = '\0';
 		LOCAL_USER_REMOVE(u);
 		return buffer;
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 9ea811f62..0e315b791 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -51,9 +51,7 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data,
 		AST_APP_ARG(delim);
 	);
 
-	parse = ast_strdupa(data);
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(parse = ast_strdupa(data))) {
 		ast_copy_string(buf, "0", len);
 		return buf;
 	}
@@ -90,11 +88,8 @@ static char *builtin_function_filter(struct ast_channel *chan, char *cmd, char *
 	);
 	char *outbuf=buf;
 
-	parse = ast_strdupa(data);
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory");
+	if (!(parse = ast_strdupa(data)))
 		return "";
-	}
 
 	AST_STANDARD_APP_ARGS(args, parse);
 
@@ -140,11 +135,8 @@ static char *builtin_function_regex(struct ast_channel *chan, char *cmd, char *d
 
 	ast_copy_string(buf, "0", len);
 	
-	parse = ast_strdupa(data);
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory in %s(%s)\n", cmd, data);
+	if (!(parse = ast_strdupa(data)))
 		return buf;
-	}
 
 	AST_NONSTANDARD_APP_ARGS(args, parse, '"');
 
@@ -185,10 +177,8 @@ static void builtin_function_array(struct ast_channel *chan, char *cmd, char *da
 
 	var = ast_strdupa(data);
 	value2 = ast_strdupa(value);
-	if (!var || !value2) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!var || !value2)
 		return;
-	}
 
 	/* The functions this will generally be used with are SORT and ODBC_*, which
 	 * both return comma-delimited lists.  However, if somebody uses literal lists,
@@ -276,11 +266,8 @@ static char *acf_strftime(struct ast_channel *chan, char *cmd, char *data, char
 		return buf;
 	}
 	
-	parse = ast_strdupa(data);
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(parse = ast_strdupa(data)))
 		return buf;
-	}
 	
 	AST_STANDARD_APP_ARGS(args, parse);