on this pass, only remove duplicate log messages

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

39 files changed, 47 insertions, 157 deletions

diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index b7678a002..3dd27fe11 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -128,9 +128,7 @@ static int auth_exec(struct ast_channel *chan, void *data)
 		}
 	}
 	
-	argcopy = ast_strdupa(data);
-	if (!argcopy) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(argcopy = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 5d49e1268..1d828d59b 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -383,10 +383,8 @@ static int chanspy_exec(struct ast_channel *chan, void *data)
 	struct ast_flags flags;
 	signed char zero_volume = 0;
 
-	if (!(args = ast_strdupa((char *)data))) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(args = ast_strdupa(data)))
 		return -1;
-	}
 
 	LOCAL_USER_ADD(u);
 
diff --git a/apps/app_curl.c b/apps/app_curl.c
index 93d77d571..c1736969b 100644
--- a/apps/app_curl.c
+++ b/apps/app_curl.c
@@ -128,9 +128,7 @@ static char *acf_curl_exec(struct ast_channel *chan, char *cmd, char *data, char
 
 	LOCAL_USER_ACF_ADD(u);
 
-	info = ast_strdupa(data);
-	if (!info) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(info = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return buf;
 	}
diff --git a/apps/app_db.c b/apps/app_db.c
index 76a52cd1b..3eafca591 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -75,9 +75,7 @@ static int deltree_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	argv = ast_strdupa(data);
-	if (!argv) {
-		ast_log(LOG_ERROR, "Memory allocation failed\n");
+	if (!(argv = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return 0;
 	}
@@ -121,9 +119,7 @@ static int del_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	argv = ast_strdupa(data);
-	if (!argv) {
-		ast_log (LOG_ERROR, "Memory allocation failed\n");
+	if (!(argv = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return 0;
 	}
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 3d45cf577..25fa9cfc5 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -787,7 +787,6 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 	LOCAL_USER_ADD(u);
 
 	if (!(parse = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory allocation failure\n");
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
@@ -1627,9 +1626,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	announce = ast_strdupa(data);	
-	if (!announce) {	
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(announce = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 3935c81ac..20fec3c98 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -110,11 +110,8 @@ static int dictate_exec(struct ast_channel *chan, void *data)
 	
 	snprintf(dftbase, sizeof(dftbase), "%s/dictate", ast_config_AST_SPOOL_DIR);
 	if (!ast_strlen_zero(data)) {
-		parse = ast_strdupa(data);
-		if (!parse) {
-			ast_log(LOG_ERROR, "Out of memory!\n");
+		if (!(parse = ast_strdupa(data)))
 			return -1;
-		}
 		AST_STANDARD_APP_ARGS(args, parse);
 	} else
 		args.argc = 0;
diff --git a/apps/app_directory.c b/apps/app_directory.c
index d506df1f1..d32250187 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -431,10 +431,7 @@ static int directory_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	parse = ast_strdupa(data);
-
-	if (!parse) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(parse = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1; 
 	}
diff --git a/apps/app_disa.c b/apps/app_disa.c
index 3ba92e8a2..cbaae05a5 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -161,9 +161,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
 	ast_log(LOG_DEBUG, "Digittimeout: %d\n", digittimeout);
 	ast_log(LOG_DEBUG, "Responsetimeout: %d\n", firstdigittimeout);
 
-	tmp = ast_strdupa(data);
-	if (!tmp) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(tmp = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}	
diff --git a/apps/app_exec.c b/apps/app_exec.c
index 9759455ac..9f8390d5c 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -73,8 +73,7 @@ static int exec_exec(struct ast_channel *chan, void *data)
 
 	/* Check and parse arguments */
 	if (data) {
-		s = ast_strdupa((char *)data);
-		if (s) {
+		if ((s = ast_strdupa(data))) {
 			appname = strsep(&s, "(");
 			if (s) {
 				endargs = strrchr(s, ')');
@@ -91,10 +90,8 @@ static int exec_exec(struct ast_channel *chan, void *data)
 					res = -1;
 				}
 			}
-		} else {
-			ast_log(LOG_ERROR, "Out of memory\n");
+		} else
 			res = -1;
-		}
 	}
 
 	LOCAL_USER_REMOVE(u);
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 10232044d..37359c690 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -271,9 +271,7 @@ static int app_exec(struct ast_channel *chan, void *data)
 		goto exit;
 	}
 
-	buf = ast_strdupa(data);
-	if (!buf) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(buf = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_festival.c b/apps/app_festival.c
index 1921fdd11..e00fce618 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -339,9 +339,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
 		festivalcommand = "(tts_textasterisk \"%s\" 'file)(quit)\n";
 	}
 	
-	data = ast_strdupa(vdata);
-	if (!data) {
-		ast_log(LOG_ERROR, "Out of memery\n");
+	if (!(data = ast_strdupa(vdata))) {
 		ast_config_destroy(cfg);
 		LOCAL_USER_REMOVE(u);
 		return -1;
diff --git a/apps/app_hasnewvoicemail.c b/apps/app_hasnewvoicemail.c
index bb5535190..f2350ebcd 100644
--- a/apps/app_hasnewvoicemail.c
+++ b/apps/app_hasnewvoicemail.c
@@ -129,9 +129,7 @@ static int hasvoicemail_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	input = ast_strdupa((char *)data);
-	if (! input) {
-		ast_log(LOG_ERROR, "Out of memory error\n");
+	if (!(input = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
@@ -193,9 +191,7 @@ static char *acf_vmcount_exec(struct ast_channel *chan, char *cmd, char *data, c
 
 	buf[0] = '\0';
 
-	argsstr = ast_strdupa(data);
-	if (!argsstr) {
-		ast_log(LOG_ERROR, "Out of memory");
+	if (!(argsstr = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return buf;
 	}
diff --git a/apps/app_image.c b/apps/app_image.c
index d33465aa9..75cb34653 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -79,7 +79,6 @@ static int sendimage_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 
 	if (!(parse = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 63cf46474..a011dc65d 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -307,9 +307,7 @@ static int macroif_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	expr = ast_strdupa(data);
-	if (!expr) {
-		ast_log(LOG_ERROR, "Out of Memory!\n");
+	if (!(expr = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index c3068ce3c..b3291f52a 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1778,11 +1778,8 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
 				if (strcasecmp(var->name, "conf"))
 					continue;
 				
-				parse = ast_strdupa(var->value);
-				if (!parse) {
-					ast_log(LOG_ERROR, "Out of Memory!\n");
+				if (!(parse = ast_strdupa(var->value)))
 					return NULL;
-				}
 				
 				AST_STANDARD_APP_ARGS(args, parse);
 				if (!strcasecmp(args.confno, confno)) {
@@ -1838,9 +1835,7 @@ static int count_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 	
-	localdata = ast_strdupa(data);
-	if (!localdata) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(localdata = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
@@ -1987,8 +1982,6 @@ static int conf_exec(struct ast_channel *chan, void *data)
 										}
 									}
 								}
-							} else {
-								ast_log(LOG_ERROR, "Out of memory\n");
 							}
 						}
 						var = var->next;
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 279f0e646..acc882502 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -334,7 +334,6 @@ static int mixmonitor_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 
 	if (!(parse = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index af9bf9877..e94a15ef5 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -138,9 +138,7 @@ static int osplookup_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	temp = ast_strdupa(data);
-	if (!temp) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(temp = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
@@ -201,9 +199,7 @@ static int ospnext_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	temp = ast_strdupa(data);
-	if (!temp) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(temp = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
@@ -275,9 +271,7 @@ static int ospfinished_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	temp = ast_strdupa(data);
-	if (!temp) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(temp = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_page.c b/apps/app_page.c
index 4dd9f2015..44e603519 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -163,9 +163,7 @@ static int page_exec(struct ast_channel *chan, void *data)
 		return -1;
 	};
 
-	options = ast_strdupa(data);
-	if (!options) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(options = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 653d95467..2023308ba 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -89,11 +89,8 @@ static int playback_exec(struct ast_channel *chan, void *data)
 		return -1;
 	}
 
-	tmp = ast_strdupa(data);
-	if (!tmp) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(tmp = ast_strdupa(data)))
 		return -1;	
-	}
 
 	LOCAL_USER_ADD(u);
 	AST_STANDARD_APP_ARGS(args, tmp);
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index a3d26af33..2503b82f3 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -117,9 +117,7 @@ static int privacy_exec (struct ast_channel *chan, void *data)
 
 		if (!ast_strlen_zero((char *)data))
 		{
-			parse = ast_strdupa(data);
-			if (!parse) {
-				ast_log(LOG_ERROR, "Out of memory!\n");
+			if (!(parse = ast_strdupa(data))) {
 				LOCAL_USER_REMOVE(u);
 				return -1;
 			}
diff --git a/apps/app_queue.c b/apps/app_queue.c
index c09ac3b26..582059b1b 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2671,7 +2671,6 @@ static int pqm_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 
 	if (!(parse = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
@@ -2727,7 +2726,6 @@ static int upqm_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 
 	if (!(parse = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
 		LOCAL_USER_REMOVE(u);
 		return -1;	
 	}
@@ -2785,7 +2783,6 @@ static int rqm_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 
 	if (!(parse = ast_strdupa(data))) {
-		ast_log(LOG_WARNING, "Memory Error!\n");
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_random.c b/apps/app_random.c
index f7d09e87a..b533166af 100644
--- a/apps/app_random.c
+++ b/apps/app_random.c
@@ -73,9 +73,7 @@ static int random_exec(struct ast_channel *chan, void *data)
 	
 	LOCAL_USER_ADD(u);
 
-	s = ast_strdupa(data);
-	if (!s) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(s = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_read.c b/apps/app_read.c
index ef7f183ad..461ad995e 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -117,9 +117,7 @@ static int read_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 	
-	argcopy = ast_strdupa(data);
-	if (!argcopy) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(argcopy = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 528fe8237..f842663ee 100644
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -73,9 +73,7 @@ static int readfile_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	s = ast_strdupa(data);
-	if (!s) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(s = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_record.c b/apps/app_record.c
index f5be5528d..f594947bd 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -116,9 +116,7 @@ static int record_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 
 	/* Yay for strsep being easy */
-	vdata = ast_strdupa(data);
-	if (!vdata) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(vdata = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index cde4e65c9..c6db4f140 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -93,8 +93,7 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data)
 
 	if (data) {
 		s = data;
-		s = ast_strdupa(s);
-		if (s) {
+		if ((s = ast_strdupa(s))) {
 			timec = strsep(&s,"|");
 			if ((timec) && (*timec != '\0')) {
 				long timein;
@@ -110,8 +109,6 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data)
 					format = s;
 				}
 			}
-		} else {
-			ast_log(LOG_ERROR, "Out of memory error\n");
 		}
 	}
 
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index e4eb33ecf..b019c9601 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -74,9 +74,7 @@ static int senddtmf_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	digits = ast_strdupa(data);
-	if (!digits) {
-		ast_log(LOG_ERROR, "Out of Memory!\n");
+	if (!(digits = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 4ddbc1c65..fea5ebaf9 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -88,9 +88,7 @@ static int sendtext_exec(struct ast_channel *chan, void *data)
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	} else {
-		parse = ast_strdupa(data);
-		if (!parse) {
-			ast_log(LOG_ERROR, "Out of memory!\n");
+		if (!(parse = ast_strdupa(data))) {
 			LOCAL_USER_REMOVE(u);
 			return -1;
 		}
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 7c643b281..b3a70c4f5 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -117,9 +117,7 @@ static int setcallerid_exec(struct ast_channel *chan, void *data)
 	
 	LOCAL_USER_ADD(u);
 	
-	tmp = ast_strdupa(data);
-	if (!tmp) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(tmp = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_skel.c b/apps/app_skel.c
index b29f3162a..27c9a7a50 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -87,9 +87,7 @@ static int app_exec(struct ast_channel *chan, void *data)
 	/* Do our thing here */
 
 	/* We need to make a copy of the input string if we are going to modify it! */
-	args = ast_strdupa(data);	
-	if (!args) {
-		ast_log(LOG_ERROR, "Out of memory!\n");
+	if (!(args = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_stack.c b/apps/app_stack.c
index db2eafa85..60aa22f03 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -129,11 +129,8 @@ static int gosubif_exec(struct ast_channel *chan, void *data)
 		return 0;
 	}
 
-	args = ast_strdupa((char *)data);
-	if (!args) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(args = ast_strdupa(data)))
 		return -1;
-	}
 
 	LOCAL_USER_ADD(u);
 
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 2223e85b6..cd1e68049 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -88,9 +88,7 @@ static int background_detect_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	tmp = ast_strdupa(data);
-	if (!tmp) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(tmp = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}	
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 98790341e..41c6e35dd 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -94,9 +94,7 @@ static int transfer_exec(struct ast_channel *chan, void *data)
 		pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "FAILURE");
 		return 0;
 	} else {
-		parse = ast_strdupa(data);
-		if (!parse) {
-			ast_log(LOG_ERROR, "Out of memory!\n");
+		if (!(parse = ast_strdupa(data))) {
 			LOCAL_USER_REMOVE(u);
 			return -1;
 		}
diff --git a/apps/app_url.c b/apps/app_url.c
index 7791b4e54..2b8dccff9 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -94,9 +94,7 @@ static int sendurl_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	tmp = ast_strdupa(data);
-	if (!tmp) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(tmp = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 95f5fbc84..a62c50b88 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -74,9 +74,7 @@ static int userevent_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	info = ast_strdupa(data);
-	if (!info) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(info = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 4ec4839d7..72504c6fa 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -67,8 +67,7 @@ static int verbose_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 
 	if (data) {
-		vtext = ast_strdupa((char *)data);
-		if (vtext) {
+		if ((vtext = ast_strdupa(data))) {
 			char *tmp = strsep(&vtext, "|,");
 			if (vtext) {
 				if (sscanf(tmp, "%d", &vsize) != 1) {
@@ -97,8 +96,6 @@ static int verbose_exec(struct ast_channel *chan, void *data)
 					ast_verbose(VERBOSE_PREFIX_4 "%s\n", vtext);
 				}
 			}
-		} else {
-			ast_log(LOG_ERROR, "Out of memory\n");
 		}
 	}
 
@@ -120,9 +117,7 @@ static int log_exec(struct ast_channel *chan, void *data)
 		return 0;
 	}
 
-	ltext = ast_strdupa(data);
-	if (!ltext) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(ltext = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return 0;
 	}
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index e46735d03..401b15a99 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3284,8 +3284,7 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu,
 	snprintf(ext_context, sizeof(ext_context), "%s@%s", vmu->mailbox, vmu->context);
 
 	/* Attach only the first format */
-	fmt = ast_strdupa(fmt);
-	if (fmt) {
+	if ((fmt = ast_strdupa(fmt))) {
 		stringp = fmt;
 		strsep(&stringp, "|");
 
@@ -3304,8 +3303,6 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu,
 				myserveremail = vmu->serveremail;
 			sendpage(myserveremail, vmu->pager, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, duration, vmu, category);
 		}
-	} else {
-		ast_log(LOG_ERROR, "Out of memory\n");
 	}
 
 	if (ast_test_flag(vmu, VM_DELETE)) {
@@ -5057,9 +5054,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
 			AST_APP_ARG(argv1);
 		);
 				        
-		parse = ast_strdupa(data);
-		if (!parse) {
-			ast_log(LOG_ERROR, "Out of memory!\n");
+		if (!(parse = ast_strdupa(data))) {
 			LOCAL_USER_REMOVE(u);
 			return -1;
 		}
@@ -5647,9 +5642,7 @@ static int vm_box_exists(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	box = ast_strdupa(data);
-	if (!box) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(box = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
@@ -5689,11 +5682,8 @@ static int vmauthenticate(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 	
 	if (s) {
-		s = ast_strdupa(s);
-		if (!s) {
-			ast_log(LOG_ERROR, "Out of memory\n");
+		if (!(s = ast_strdupa(s)))
 			return -1;
-		}
 		user = strsep(&s, "|");
 		options = strsep(&s, "|");
 		if (user) {
@@ -6139,8 +6129,7 @@ static int load_config(void)
 						struct vm_zone *z;
 						if ((z = ast_malloc(sizeof(*z)))) {
 							char *msg_format, *timezone;
-							msg_format = ast_strdupa(var->value);
-							if (msg_format != NULL) {
+							if ((msg_format = ast_strdupa(var->value))) {
 								timezone = strsep(&msg_format, "|");
 								if (msg_format) {
 									ast_copy_string(z->name, var->name, sizeof(z->name));
@@ -6159,7 +6148,6 @@ static int load_config(void)
 									free(z);
 								}
 							} else {
-								ast_log(LOG_WARNING, "Out of memory while reading voicemail config\n");
 								free(z);
 								return -1;
 							}
diff --git a/apps/app_while.c b/apps/app_while.c
index 1ebd8f2b3..cd7053b21 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -89,9 +89,7 @@ static int execif_exec(struct ast_channel *chan, void *data) {
 
 	LOCAL_USER_ADD(u);
 
-	expr = ast_strdupa(data);
-	if (!expr) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(expr = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}
diff --git a/apps/app_zapras.c b/apps/app_zapras.c
index 94285cb45..e884f64cc 100644
--- a/apps/app_zapras.c
+++ b/apps/app_zapras.c
@@ -209,9 +209,7 @@ static int zapras_exec(struct ast_channel *chan, void *data)
 
 	LOCAL_USER_ADD(u);
 
-	args = ast_strdupa(data);
-	if (!args) {
-		ast_log(LOG_ERROR, "Out of memory\n");
+	if (!(args = ast_strdupa(data))) {
 		LOCAL_USER_REMOVE(u);
 		return -1;
 	}