on this pass, only remove duplicate log messages

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

1 files changed, 5 insertions, 18 deletions

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);