remove lots of useless checks of the result of ast_strdupa
authorRussell Bryant <russell@russellbryant.com>
Sat, 21 Jan 2006 08:13:12 +0000 (08:13 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 21 Jan 2006 08:13:12 +0000 (08:13 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8379 65c4cc65-6c06-0410-ace0-fbb531ad65f3

40 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_realtime.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

index b7678a0..4625061 100644 (file)
@@ -129,11 +129,6 @@ static int auth_exec(struct ast_channel *chan, void *data)
        }
        
        argcopy = ast_strdupa(data);
-       if (!argcopy) {
-               ast_log(LOG_ERROR, "Out of memory!\n");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        AST_STANDARD_APP_ARGS(arglist,argcopy);
        
index 5d49e12..7d5c4ad 100644 (file)
@@ -383,10 +383,7 @@ 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");
-               return -1;
-       }
+       args = ast_strdupa(data);
 
        LOCAL_USER_ADD(u);
 
index 93d77d5..9842da4 100644 (file)
@@ -129,11 +129,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return buf;
-       }
 
        AST_STANDARD_APP_ARGS(args, info);      
        
index 76a52cd..0161d4a 100644 (file)
@@ -76,11 +76,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return 0;
-       }
 
        if (strchr(argv, '/')) {
                family = strsep(&argv, "/");
@@ -122,11 +117,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return 0;
-       }
 
        if (strchr(argv, '/')) {
                family = strsep(&argv, "/");
index 3d45cf5..21e2342 100644 (file)
@@ -786,11 +786,7 @@ 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;
-       }
+       parse = ast_strdupa(data);
        
        AST_STANDARD_APP_ARGS(args, parse);
 
@@ -1628,11 +1624,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
        
        memset(&peerflags, 0, sizeof(peerflags));
 
index 3935c81..29f27d9 100644 (file)
@@ -111,10 +111,6 @@ 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");
-                       return -1;
-               }
                AST_STANDARD_APP_ARGS(args, parse);
        } else
                args.argc = 0;
index d506df1..4a4a6f5 100644 (file)
@@ -433,12 +433,6 @@ static int directory_exec(struct ast_channel *chan, void *data)
 
        parse = ast_strdupa(data);
 
-       if (!parse) {
-               ast_log(LOG_ERROR, "Out of memory!\n");
-               LOCAL_USER_REMOVE(u);
-               return -1; 
-       }
-
        AST_STANDARD_APP_ARGS(args, parse);
                
        if (args.options) {
index 3ba92e8..3c78b9b 100644 (file)
@@ -162,11 +162,6 @@ static int disa_exec(struct ast_channel *chan, void *data)
        ast_log(LOG_DEBUG, "Responsetimeout: %d\n", firstdigittimeout);
 
        tmp = ast_strdupa(data);
-       if (!tmp) {
-               ast_log(LOG_ERROR, "Out of memory\n");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }       
 
        AST_STANDARD_APP_ARGS(args, tmp);
 
index 9759455..b2a45dc 100644 (file)
@@ -73,27 +73,22 @@ static int exec_exec(struct ast_channel *chan, void *data)
 
        /* Check and parse arguments */
        if (data) {
-               s = ast_strdupa((char *)data);
+               s = ast_strdupa(data);
+               appname = strsep(&s, "(");
                if (s) {
-                       appname = strsep(&s, "(");
-                       if (s) {
-                               endargs = strrchr(s, ')');
-                               if (endargs)
-                                       *endargs = '\0';
-                               pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1);
-                       }
-                       if (appname) {
-                               app = pbx_findapp(appname);
-                               if (app) {
-                                       res = pbx_exec(chan, app, args, 1);
-                               } else {
-                                       ast_log(LOG_WARNING, "Could not find application (%s)\n", appname);
-                                       res = -1;
-                               }
+                       endargs = strrchr(s, ')');
+                       if (endargs)
+                               *endargs = '\0';
+                       pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1);
+               }
+               if (appname) {
+                       app = pbx_findapp(appname);
+                       if (app) {
+                               res = pbx_exec(chan, app, args, 1);
+                       } else {
+                               ast_log(LOG_WARNING, "Could not find application (%s)\n", appname);
+                               res = -1;
                        }
-               } else {
-                       ast_log(LOG_ERROR, "Out of memory\n");
-                       res = -1;
                }
        }
 
index 1023204..bcf65d3 100644 (file)
@@ -272,11 +272,6 @@ static int app_exec(struct ast_channel *chan, void *data)
        }
 
        buf = ast_strdupa(data);
-       if (!buf) {
-               ast_log(LOG_ERROR, "Out of memory!\n");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        argc = ast_app_separate_args(buf, '|', argv, sizeof(argv) / sizeof(argv[0]));
 
index 1921fdd..4ef0f01 100644 (file)
@@ -340,12 +340,6 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
        }
        
        data = ast_strdupa(vdata);
-       if (!data) {
-               ast_log(LOG_ERROR, "Out of memery\n");
-               ast_config_destroy(cfg);
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        intstr = strchr(data, '|');
        if (intstr) {   
index bb55351..f4696fc 100644 (file)
@@ -130,11 +130,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        AST_STANDARD_APP_ARGS(args, input);
 
@@ -194,11 +189,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return buf;
-       }
 
        AST_STANDARD_APP_ARGS(args, argsstr);
 
index d33465a..689c193 100644 (file)
@@ -78,11 +78,7 @@ 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;
-       }
+       parse = ast_strdupa(data);
 
        AST_STANDARD_APP_ARGS(args, parse);
 
index 63cf464..a33e9f2 100644 (file)
@@ -308,11 +308,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        if ((label_a = strchr(expr, '?'))) {
                *label_a = '\0';
index c3068ce..3ce6298 100644 (file)
@@ -1779,10 +1779,6 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
                                        continue;
                                
                                parse = ast_strdupa(var->value);
-                               if (!parse) {
-                                       ast_log(LOG_ERROR, "Out of Memory!\n");
-                                       return NULL;
-                               }
                                
                                AST_STANDARD_APP_ARGS(args, parse);
                                if (!strcasecmp(args.confno, confno)) {
@@ -1839,11 +1835,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        AST_STANDARD_APP_ARGS(args, localdata);
        
index 279f0e6..0b1f68e 100644 (file)
@@ -333,11 +333,7 @@ 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;
-       }
+       parse = ast_strdupa(data);
 
        AST_STANDARD_APP_ARGS(args, parse);
        
index af9bf98..18091e5 100644 (file)
@@ -139,11 +139,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        AST_STANDARD_APP_ARGS(args, temp);
 
@@ -202,11 +197,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        AST_STANDARD_APP_ARGS(args, temp);
 
@@ -276,11 +266,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        AST_STANDARD_APP_ARGS(args, temp);
 
index 4dd9f20..b4eb1a5 100644 (file)
@@ -164,11 +164,6 @@ static int page_exec(struct ast_channel *chan, void *data)
        };
 
        options = ast_strdupa(data);
-       if (!options) {
-               ast_log(LOG_ERROR, "Out of memory\n");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        tmp = strsep(&options, "|");
        if (options)
index 653d954..7df06d9 100644 (file)
@@ -90,10 +90,6 @@ static int playback_exec(struct ast_channel *chan, void *data)
        }
 
        tmp = ast_strdupa(data);
-       if (!tmp) {
-               ast_log(LOG_ERROR, "Out of memory!\n");
-               return -1;      
-       }
 
        LOCAL_USER_ADD(u);
        AST_STANDARD_APP_ARGS(args, tmp);
index a3d26af..3a0561b 100644 (file)
@@ -118,11 +118,6 @@ 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");
-                               LOCAL_USER_REMOVE(u);
-                               return -1;
-                       }
                        
                        AST_STANDARD_APP_ARGS(args, parse);
 
index d48d163..e0acccc 100644 (file)
@@ -2645,11 +2645,7 @@ 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;
-       }
+       parse = ast_strdupa(data);
 
        AST_STANDARD_APP_ARGS(args, parse);
 
@@ -2701,11 +2697,7 @@ 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;
-       }
+       parse = ast_strdupa(data);
 
        AST_STANDARD_APP_ARGS(args, parse);
 
@@ -2759,11 +2751,7 @@ 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;
-       }
+       parse = ast_strdupa(data);
 
        AST_STANDARD_APP_ARGS(args, parse);
 
index f7d09e8..2ebd437 100644 (file)
@@ -74,11 +74,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        prob = strsep(&s,":");
        if ((!prob) || (sscanf(prob, "%d", &probint) != 1))
index ef7f183..eaa9cfd 100644 (file)
@@ -118,11 +118,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        AST_STANDARD_APP_ARGS(arglist, argcopy);
 
index 528fe82..3393548 100644 (file)
@@ -74,11 +74,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        varname = strsep(&s, "=");
        file = strsep(&s, "|");
index 9e83d26..a88620e 100644 (file)
@@ -148,20 +148,19 @@ static int realtime_update_exec(struct ast_channel *chan, void *data)
        
        LOCAL_USER_ADD(u);
 
-       if ((family = ast_strdupa(data))) {
-               if ((colmatch = strchr(family,'|'))) {
-                       crop_data(colmatch);
-                       if ((value = strchr(colmatch,'|'))) {
-                               crop_data(value);
-                               if ((newcol = strchr(value,'|'))) {
-                                       crop_data(newcol);
-                                       if ((newval = strchr(newcol,'|'))) 
-                                               crop_data(newval);
-                               }
+       family = ast_strdupa(data);
+       if ((colmatch = strchr(family,'|'))) {
+               crop_data(colmatch);
+               if ((value = strchr(colmatch,'|'))) {
+                       crop_data(value);
+                       if ((newcol = strchr(value,'|'))) {
+                               crop_data(newcol);
+                               if ((newval = strchr(newcol,'|'))) 
+                                       crop_data(newval);
                        }
                }
        }
-       if (! (family && value && colmatch && newcol && newval) ) {
+       if (!newval) {
                ast_log(LOG_ERROR,"Invalid input: usage %s\n",UUSAGE);
                res = -1;
        } else {
@@ -193,17 +192,16 @@ static int realtime_exec(struct ast_channel *chan, void *data)
        
        LOCAL_USER_ADD(u);
 
-       if ((family = ast_strdupa(data))) {
-               if ((colmatch = strchr(family,'|'))) {
-                       crop_data(colmatch);
-                       if ((value = strchr(colmatch,'|'))) {
-                               crop_data(value);
-                               if ((prefix = strchr(value,'|')))
-                                       crop_data(prefix);
-                       }
+       family = ast_strdupa(data);
+       if ((colmatch = strchr(family,'|'))) {
+               crop_data(colmatch);
+               if ((value = strchr(colmatch,'|'))) {
+                       crop_data(value);
+                       if ((prefix = strchr(value,'|')))
+                               crop_data(prefix);
                }
        }
-       if (! (family && value && colmatch) ) {
+       if (!value) {
                ast_log(LOG_ERROR,"Invalid input: usage %s\n",USAGE);
                res = -1;
        } else {
index f5be552..c4f28fc 100644 (file)
@@ -117,11 +117,6 @@ static int record_exec(struct ast_channel *chan, void *data)
 
        /* Yay for strsep being easy */
        vdata = ast_strdupa(data);
-       if (!vdata) {
-               ast_log(LOG_ERROR, "Out of memory\n");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        p = vdata;
        filename = strsep(&p, "|");
index cde4e65..4739d97 100644 (file)
@@ -92,26 +92,21 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data)
        } 
 
        if (data) {
-               s = data;
-               s = ast_strdupa(s);
-               if (s) {
-                       timec = strsep(&s,"|");
-                       if ((timec) && (*timec != '\0')) {
-                               long timein;
-                               if (sscanf(timec,"%ld",&timein) == 1) {
-                                       unixtime = (time_t)timein;
-                               }
+               s = ast_strdupa(data);
+               timec = strsep(&s,"|");
+               if ((timec) && (*timec != '\0')) {
+                       long timein;
+                       if (sscanf(timec,"%ld",&timein) == 1) {
+                               unixtime = (time_t)timein;
                        }
+               }
+               if (s) {
+                       zone = strsep(&s,"|");
+                       if (zone && (*zone == '\0'))
+                               zone = NULL;
                        if (s) {
-                               zone = strsep(&s,"|");
-                               if (zone && (*zone == '\0'))
-                                       zone = NULL;
-                               if (s) {
-                                       format = s;
-                               }
+                               format = s;
                        }
-               } else {
-                       ast_log(LOG_ERROR, "Out of memory error\n");
                }
        }
 
index e4eb33e..fe1af90 100644 (file)
@@ -75,11 +75,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        if ((to = strchr(digits,'|'))) {
                *to = '\0';
index 4ddbc1c..4f39fa4 100644 (file)
@@ -87,14 +87,8 @@ static int sendtext_exec(struct ast_channel *chan, void *data)
                ast_log(LOG_WARNING, "SendText requires an argument (text[|options])\n");
                LOCAL_USER_REMOVE(u);
                return -1;
-       } else {
+       } else
                parse = ast_strdupa(data);
-               if (!parse) {
-                       ast_log(LOG_ERROR, "Out of memory!\n");
-                       LOCAL_USER_REMOVE(u);
-                       return -1;
-               }
-       }
        
        AST_STANDARD_APP_ARGS(args, parse);
 
index 7c643b2..5e857c4 100644 (file)
@@ -118,11 +118,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
        
        opt = strchr(tmp, '|');
        if (opt) {
index b29f316..ba2999a 100644 (file)
@@ -88,11 +88,6 @@ static int app_exec(struct ast_channel *chan, void *data)
 
        /* 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
        
        if ((argc = ast_app_separate_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
                dummy = argv[0];
index db2eafa..8323f0b 100644 (file)
@@ -130,10 +130,6 @@ static int gosubif_exec(struct ast_channel *chan, void *data)
        }
 
        args = ast_strdupa((char *)data);
-       if (!args) {
-               ast_log(LOG_ERROR, "Out of memory\n");
-               return -1;
-       }
 
        LOCAL_USER_ADD(u);
 
index 2223e85..89a69e7 100644 (file)
@@ -89,11 +89,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }       
 
        stringp=tmp;
        strsep(&stringp, "|");
index 9879034..c97d97d 100644 (file)
@@ -88,19 +88,14 @@ static int transfer_exec(struct ast_channel *chan, void *data)
 
        LOCAL_USER_ADD(u);
 
-       if (ast_strlen_zero((char *)data)) {
+       if (ast_strlen_zero(data)) {
                ast_log(LOG_WARNING, "Transfer requires an argument ([Tech/]destination[|options])\n");
                LOCAL_USER_REMOVE(u);
                pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "FAILURE");
                return 0;
-       } else {
-               parse = ast_strdupa(data);
-               if (!parse) {
-                       ast_log(LOG_ERROR, "Out of memory!\n");
-                       LOCAL_USER_REMOVE(u);
-                       return -1;
-               }
        }
+       
+       parse = ast_strdupa(data);
 
        AST_STANDARD_APP_ARGS(args, parse);
 
index 7791b4e..10bd1fa 100644 (file)
@@ -94,14 +94,8 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
+       stringp = tmp = ast_strdupa(data);
 
-       stringp=tmp;
        strsep(&stringp, "|");
        options = strsep(&stringp, "|");
        if (options && !strcasecmp(options, "wait"))
index 95f5fbc..850627f 100644 (file)
@@ -75,11 +75,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        snprintf(eventname, sizeof(eventname), "UserEvent%s", info);
        eventbody = strchr(eventname, '|');
index 4ec4839..4b7a54b 100644 (file)
@@ -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, "|");
 
index e46735d..bf6e93a 100644 (file)
@@ -3284,28 +3284,23 @@ 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) {
-               stringp = fmt;
-               strsep(&stringp, "|");
-
-               if (!ast_strlen_zero(vmu->email)) {
-                       int attach_user_voicemail = ast_test_flag((&globalflags), VM_ATTACH);
-                       char *myserveremail = serveremail;
-                       attach_user_voicemail = ast_test_flag(vmu, VM_ATTACH);
-                       if (!ast_strlen_zero(vmu->serveremail))
-                               myserveremail = vmu->serveremail;
-                       sendmail(myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, fn, fmt, duration, attach_user_voicemail, category);
-               }
-
-               if (!ast_strlen_zero(vmu->pager)) {
-                       char *myserveremail = serveremail;
-                       if (!ast_strlen_zero(vmu->serveremail))
-                               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");
+       stringp = fmt = ast_strdupa(fmt);
+       strsep(&stringp, "|");
+
+       if (!ast_strlen_zero(vmu->email)) {
+               int attach_user_voicemail = ast_test_flag((&globalflags), VM_ATTACH);
+               char *myserveremail = serveremail;
+               attach_user_voicemail = ast_test_flag(vmu, VM_ATTACH);
+               if (!ast_strlen_zero(vmu->serveremail))
+                       myserveremail = vmu->serveremail;
+               sendmail(myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, fn, fmt, duration, attach_user_voicemail, category);
+       }
+
+       if (!ast_strlen_zero(vmu->pager)) {
+               char *myserveremail = serveremail;
+               if (!ast_strlen_zero(vmu->serveremail))
+                       myserveremail = vmu->serveremail;
+               sendpage(myserveremail, vmu->pager, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, duration, vmu, category);
        }
 
        if (ast_test_flag(vmu, VM_DELETE)) {
@@ -5058,11 +5053,6 @@ static int vm_execmain(struct ast_channel *chan, void *data)
                );
                                        
                parse = ast_strdupa(data);
-               if (!parse) {
-                       ast_log(LOG_ERROR, "Out of memory!\n");
-                       LOCAL_USER_REMOVE(u);
-                       return -1;
-               }
 
                AST_STANDARD_APP_ARGS(args, parse);
 
@@ -5648,11 +5638,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        AST_STANDARD_APP_ARGS(args, box);
 
@@ -5690,10 +5675,6 @@ static int vmauthenticate(struct ast_channel *chan, void *data)
        
        if (s) {
                s = ast_strdupa(s);
-               if (!s) {
-                       ast_log(LOG_ERROR, "Out of memory\n");
-                       return -1;
-               }
                user = strsep(&s, "|");
                options = strsep(&s, "|");
                if (user) {
@@ -6140,28 +6121,22 @@ static int load_config(void)
                                                if ((z = ast_malloc(sizeof(*z)))) {
                                                        char *msg_format, *timezone;
                                                        msg_format = ast_strdupa(var->value);
-                                                       if (msg_format != NULL) {
-                                                               timezone = strsep(&msg_format, "|");
-                                                               if (msg_format) {
-                                                                       ast_copy_string(z->name, var->name, sizeof(z->name));
-                                                                       ast_copy_string(z->timezone, timezone, sizeof(z->timezone));
-                                                                       ast_copy_string(z->msg_format, msg_format, sizeof(z->msg_format));
-                                                                       z->next = NULL;
-                                                                       if (zones) {
-                                                                               zonesl->next = z;
-                                                                               zonesl = z;
-                                                                       } else {
-                                                                               zones = z;
-                                                                               zonesl = z;
-                                                                       }
+                                                       timezone = strsep(&msg_format, "|");
+                                                       if (msg_format) {
+                                                               ast_copy_string(z->name, var->name, sizeof(z->name));
+                                                               ast_copy_string(z->timezone, timezone, sizeof(z->timezone));
+                                                               ast_copy_string(z->msg_format, msg_format, sizeof(z->msg_format));
+                                                               z->next = NULL;
+                                                               if (zones) {
+                                                                       zonesl->next = z;
+                                                                       zonesl = z;
                                                                } else {
-                                                                       ast_log(LOG_WARNING, "Invalid timezone definition at line %d\n", var->lineno);
-                                                                       free(z);
+                                                                       zones = z;
+                                                                       zonesl = z;
                                                                }
                                                        } else {
-                                                               ast_log(LOG_WARNING, "Out of memory while reading voicemail config\n");
+                                                               ast_log(LOG_WARNING, "Invalid timezone definition at line %d\n", var->lineno);
                                                                free(z);
-                                                               return -1;
                                                        }
                                                } else {                                                
                                                        return -1;
index 1ebd8f2..df2fb97 100644 (file)
@@ -90,11 +90,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
 
        if ((myapp = strchr(expr,'|'))) {
                *myapp = '\0';
@@ -244,9 +239,8 @@ static int _while_exec(struct ast_channel *chan, void *data, int end)
        snprintf(used_index, VAR_SIZE, "%d", used_index_i);
        snprintf(new_index, VAR_SIZE, "%d", used_index_i + 1);
        
-       if (!end) {
-               condition = ast_strdupa((char *) data);
-       }
+       if (!end)
+               condition = ast_strdupa(data);
 
        size = strlen(chan->context) + strlen(chan->exten) + 32;
        my_name = alloca(size);
index 94285cb..9b69c39 100644 (file)
@@ -210,11 +210,6 @@ 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");
-               LOCAL_USER_REMOVE(u);
-               return -1;
-       }
        
        /* Answer the channel if it's not up */
        if (chan->_state != AST_STATE_UP)