on this pass, only remove duplicate log messages
authorRussell Bryant <russell@russellbryant.com>
Sat, 21 Jan 2006 20:57:06 +0000 (20:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 21 Jan 2006 20:57:06 +0000 (20:57 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8403 65c4cc65-6c06-0410-ace0-fbb531ad65f3

52 files changed:
apps/app_authenticate.c
apps/app_chanspy.c
apps/app_curl.c
apps/app_db.c
apps/app_dial.c
apps/app_dictate.c
apps/app_directory.c
apps/app_disa.c
apps/app_exec.c
apps/app_externalivr.c
apps/app_festival.c
apps/app_hasnewvoicemail.c
apps/app_image.c
apps/app_macro.c
apps/app_meetme.c
apps/app_mixmonitor.c
apps/app_osplookup.c
apps/app_page.c
apps/app_playback.c
apps/app_privacy.c
apps/app_queue.c
apps/app_random.c
apps/app_read.c
apps/app_readfile.c
apps/app_record.c
apps/app_sayunixtime.c
apps/app_senddtmf.c
apps/app_sendtext.c
apps/app_setcallerid.c
apps/app_skel.c
apps/app_stack.c
apps/app_talkdetect.c
apps/app_transfer.c
apps/app_url.c
apps/app_userevent.c
apps/app_verbose.c
apps/app_voicemail.c
apps/app_while.c
apps/app_zapras.c
channel.c
channels/chan_agent.c
channels/chan_iax2.c
channels/chan_sip.c
funcs/func_cdr.c
funcs/func_cut.c
funcs/func_logic.c
funcs/func_math.c
funcs/func_md5.c
funcs/func_odbc.c
funcs/func_rand.c
funcs/func_strings.c
pbx.c

index b7678a0..3dd27fe 100644 (file)
@@ -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;
        }
index 5d49e12..1d828d5 100644 (file)
@@ -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);
 
index 93d77d5..c173696 100644 (file)
@@ -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;
        }
index 76a52cd..3eafca5 100644 (file)
@@ -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;
        }
index 3d45cf5..25fa9cf 100644 (file)
@@ -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;
        }
index 3935c81..20fec3c 100644 (file)
@@ -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;
index d506df1..d322501 100644 (file)
@@ -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; 
        }
index 3ba92e8..cbaae05 100644 (file)
@@ -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;
        }       
index 9759455..9f8390d 100644 (file)
@@ -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);
index 1023204..37359c6 100644 (file)
@@ -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;
        }
index 1921fdd..e00fce6 100644 (file)
@@ -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;
index bb55351..f2350eb 100644 (file)
@@ -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;
        }
index d33465a..75cb346 100644 (file)
@@ -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;
        }
index 63cf464..a011dc6 100644 (file)
@@ -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;
        }
index c3068ce..b3291f5 100644 (file)
@@ -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;
index 279f0e6..acc8825 100644 (file)
@@ -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;
        }
index af9bf98..e94a15e 100644 (file)
@@ -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;
        }
index 4dd9f20..44e6035 100644 (file)
@@ -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;
        }
index 653d954..2023308 100644 (file)
@@ -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);
index a3d26af..2503b82 100644 (file)
@@ -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;
                        }
index c09ac3b..582059b 100644 (file)
@@ -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;
        }
index f7d09e8..b533166 100644 (file)
@@ -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;
        }
index ef7f183..461ad99 100644 (file)
@@ -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;
        }
index 528fe82..f842663 100644 (file)
@@ -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;
        }
index f5be552..f594947 100644 (file)
@@ -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;
        }
index cde4e65..c6db4f1 100644 (file)
@@ -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");
                }
        }
 
index e4eb33e..b019c96 100644 (file)
@@ -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;
        }
index 4ddbc1c..fea5eba 100644 (file)
@@ -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;
                }
index 7c643b2..b3a70c4 100644 (file)
@@ -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;
        }
index b29f316..27c9a7a 100644 (file)
@@ -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;
        }
index db2eafa..60aa22f 100644 (file)
@@ -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);
 
index 2223e85..cd1e680 100644 (file)
@@ -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;
        }       
index 9879034..41c6e35 100644 (file)
@@ -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;
                }
index 7791b4e..2b8dccf 100644 (file)
@@ -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;
        }
index 95f5fbc..a62c50b 100644 (file)
@@ -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;
        }
index 4ec4839..72504c6 100644 (file)
@@ -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;
        }
index e46735d..401b15a 100644 (file)
@@ -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;
                                                        }
index 1ebd8f2..cd7053b 100644 (file)
@@ -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;
        }
index 94285cb..e884f64 100644 (file)
@@ -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;
        }
index f331f6a..f3f4a30 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -3705,12 +3705,9 @@ ast_group_t ast_get_group(char *s)
        int start=0, finish=0, x;
        ast_group_t group = 0;
 
-       copy = ast_strdupa(s);
-       if (!copy) {
-               ast_log(LOG_ERROR, "Out of memory\n");
+       c = copy = ast_strdupa(s);
+       if (!copy)
                return 0;
-       }
-       c = copy;
        
        while ((piece = strsep(&c, ","))) {
                if (sscanf(piece, "%d-%d", &start, &finish) == 2) {
index 68652b1..d9c4b86 100644 (file)
@@ -328,11 +328,8 @@ static struct agent_pvt *add_agent(char *agent, int pending)
        char *agt = NULL;
        struct agent_pvt *p, *prev;
 
-       parse = ast_strdupa(agent);
-       if (!parse) {
-               ast_log(LOG_ERROR, "Out of memory!\n");
+       if (!(parse = ast_strdupa(agent)))
                return NULL;
-       }
 
        /* Extract username (agt), password and name from agent (args). */
        AST_NONSTANDARD_APP_ARGS(args, parse, ',');
@@ -1768,7 +1765,6 @@ static int __login_exec(struct ast_channel *chan, void *data, int callbackmode)
        LOCAL_USER_ADD(u);
 
        if (!(parse = ast_strdupa(data))) {
-               ast_log(LOG_ERROR, "Out of memory!\n");
                LOCAL_USER_REMOVE(u);
                return -1;
        }
@@ -2510,11 +2506,8 @@ static char *function_agent(struct ast_channel *chan, char *cmd, char *data, cha
                return buf;     
        }
 
-       item = ast_strdupa(data);
-       if (!item) {
-               ast_log(LOG_ERROR, "Out of memory!\n");
+       if (!(item = ast_strdupa(data)))
                return buf;
-       }
 
        agentid = strsep(&item, ":");
        if (!item)
index 6238366..b5be2e3 100644 (file)
@@ -8033,11 +8033,8 @@ static int peer_set_srcaddr(struct iax2_peer *peer, const char *srcaddr)
        char *addr;
        char *portstr;
 
-       tmp = ast_strdupa(srcaddr);
-       if (!tmp) {
-               ast_log(LOG_WARNING, "Out of memory!\n");
+       if (!(tmp = ast_strdupa(srcaddr)))
                return -1;
-       }
 
        addr = strsep(&tmp, ":");
        portstr = tmp;
@@ -9174,10 +9171,8 @@ static char *function_iaxpeer(struct ast_channel *chan, char *cmd, char *data, c
        char *peername, *colname;
        char iabuf[INET_ADDRSTRLEN];
 
-       if (!(peername = ast_strdupa(data))) {
-               ast_log(LOG_ERROR, "Memory Error!\n");
+       if (!(peername = ast_strdupa(data)))
                return ret;
-       }
 
        /* if our channel, return the IP address of the endpoint of current channel */
        if (!strcmp(peername,"CURRENTCHANNEL")) {
index fd78084..dc0df0d 100644 (file)
@@ -9292,10 +9292,8 @@ static char *function_sippeer(struct ast_channel *chan, char *cmd, char *data, c
        char *peername, *colname;
        char iabuf[INET_ADDRSTRLEN];
 
-       if (!(peername = ast_strdupa(data))) {
-               ast_log(LOG_ERROR, "Memory Error!\n");
+       if (!(peername = ast_strdupa(data)))
                return ret;
-       }
 
        if ((colname = strchr(peername, ':'))) {
                *colname = '\0';
@@ -12847,11 +12845,9 @@ static int sip_sipredirect(struct sip_pvt *p, const char *dest)
        char *extension, *host, *port;
        char tmp[80];
        
-       cdest = ast_strdupa(dest);
-       if (!cdest) {
-               ast_log(LOG_ERROR, "Problem allocating the memory\n");
+       if (!(cdest = ast_strdupa(dest)))
                return 0;
-       }
+       
        extension = strsep(&cdest, "@");
        host = strsep(&cdest, ":");
        port = strsep(&cdest, ":");
@@ -12879,17 +12875,11 @@ static int sip_sipredirect(struct sip_pvt *p, const char *dest)
                                ast_log(LOG_ERROR, "Can't find the host address\n");
                                return 0;
                        }
-                       host = ast_strdupa(lhost);
-                       if (!host) {
-                               ast_log(LOG_ERROR, "Problem allocating the memory\n");
+                       if (!(host = ast_strdupa(lhost)))
                                return 0;
-                       }
                        if (!ast_strlen_zero(lport)) {
-                               port = ast_strdupa(lport);
-                               if (!port) {
-                                       ast_log(LOG_ERROR, "Problem allocating the memory\n");
+                               if (!(port = ast_strdupa(lport)))
                                        return 0;
-                               }
                        }
                }
        }
index c5cadc7..4922b9a 100644 (file)
@@ -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);
 
index 1df4703..9064b1e 100644 (file)
@@ -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);
 
index d1d96ab..642a4d4 100644 (file)
@@ -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;
index d086fe3..ebd7a70 100644 (file)
@@ -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);
        
index 552e876..467799d 100644 (file)
@@ -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);
        
index 3e0f52f..f7f7637 100644 (file)
@@ -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 "";
        }
index dbd82c9..0f1bd00 100644 (file)
@@ -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;
index 9ea811f..0e315b7 100644 (file)
@@ -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);
 
diff --git a/pbx.c b/pbx.c
index 99840ad..75ae5ea 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -1219,11 +1219,8 @@ char *ast_func_read(struct ast_channel *chan, const char *in, char *workspace, s
        char *ret = "0";
        struct ast_custom_function *acfptr;
 
-       function = ast_strdupa(in);
-       if (!function) {
-               ast_log(LOG_ERROR, "Out of memory\n");
+       if (!(function = ast_strdupa(in)))
                return ret;
-       }
        if ((args = strchr(function, '('))) {
                *args = '\0';
                args++;
@@ -1254,11 +1251,8 @@ void ast_func_write(struct ast_channel *chan, const char *in, const char *value)
        char *args = NULL, *function, *p;
        struct ast_custom_function *acfptr;
 
-       function = ast_strdupa(in);
-       if (!function) {
-               ast_log(LOG_ERROR, "Out of memory\n");
+       if (!(function = ast_strdupa(in)))
                return;
-       }
        if ((args = strchr(function, '('))) {
                *args = '\0';
                args++;
@@ -5145,11 +5139,8 @@ static int pbx_builtin_resetcdr(struct ast_channel *chan, void *data)
        struct ast_flags flags = { 0 };
        
        if (!ast_strlen_zero(data)) {
-               args = ast_strdupa(data);
-               if (!args) {
-                       ast_log(LOG_ERROR, "Out of memory!\n");
+               if (!(args = ast_strdupa(data)))
                        return -1;
-               }
                ast_app_parse_options(resetcdr_opts, &flags, NULL, args);
        }
 
@@ -5205,8 +5196,6 @@ static int pbx_builtin_gotoiftime(struct ast_channel *chan, void *data)
                /* struct ast_include include contained garbage here, fixed by zeroing it on get_timerange */
                if (ast_build_timing(&timing, s) && ast_check_timing(&timing))
                        res = pbx_builtin_goto(chan, (void *)ts);
-       } else {
-               ast_log(LOG_ERROR, "Memory Error!\n");
        }
        return res;
 }
@@ -5227,12 +5216,8 @@ static int pbx_builtin_execiftime(struct ast_channel *chan, void *data)
                return -1;
        }
 
-       ptr1 = ast_strdupa(data);
-
-       if (!ptr1) {
-               ast_log(LOG_ERROR, "Out of Memory!\n");
-               return -1;      
-       }
+       if (!(ptr1 = ast_strdupa(data)))
+               return -1;
 
        ptr2 = ptr1;
        /* Separate the Application data ptr1 is the time spec ptr2 is the app|data */