diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-08 01:55:31 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-08 01:55:31 +0000 |
commit | df706a8900728f959c8f227580fe45227495fb81 (patch) | |
tree | ce21ec4bfdeea79845fbbf2eb5308a2e6d513fc8 | |
parent | 82616a4d97f94c6988c4db02adb6b10f77891c89 (diff) |
issue #5648
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7011 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | ChangeLog | 2 | ||||
-rwxr-xr-x | apps/app_queue.c | 4 | ||||
-rwxr-xr-x | apps/app_voicemail.c | 2 | ||||
-rwxr-xr-x | apps/app_zapscan.c | 3 | ||||
-rwxr-xr-x | channels/chan_misdn.c | 4 | ||||
-rwxr-xr-x | channels/chan_sip.c | 4 | ||||
-rwxr-xr-x | funcs/func_cdr.c | 4 | ||||
-rwxr-xr-x | funcs/func_db.c | 6 | ||||
-rwxr-xr-x | funcs/func_enum.c | 4 | ||||
-rwxr-xr-x | funcs/func_env.c | 4 | ||||
-rwxr-xr-x | funcs/func_groupcount.c | 4 | ||||
-rwxr-xr-x | funcs/func_logic.c | 6 | ||||
-rwxr-xr-x | funcs/func_math.c | 2 | ||||
-rwxr-xr-x | funcs/func_md5.c | 2 | ||||
-rwxr-xr-x | funcs/func_strings.c | 4 | ||||
-rwxr-xr-x | funcs/func_uri.c | 4 | ||||
-rwxr-xr-x | pbx/pbx_ael.c | 2 | ||||
-rwxr-xr-x | pbx/pbx_dundi.c | 30 | ||||
-rwxr-xr-x | pbx/pbx_loopback.c | 4 | ||||
-rwxr-xr-x | pbx/pbx_realtime.c | 4 | ||||
-rwxr-xr-x | res/res_agi.c | 2 | ||||
-rwxr-xr-x | res/res_config_odbc.c | 4 | ||||
-rwxr-xr-x | res/res_features.c | 6 | ||||
-rwxr-xr-x | res/res_monitor.c | 22 | ||||
-rwxr-xr-x | res/res_musiconhold.c | 10 |
25 files changed, 73 insertions, 70 deletions
@@ -1,5 +1,7 @@ 2005-11-07 Kevin P. Fleming <kpfleming@digium.com> + * many files: don't check for NULL before calling ast_strlen_zero, it can do it itself (issue #5648) + * pbx.c (handle_show_hints): use proper state-to-string function for hint state (issue #5583) * rtp.c: use unsigned format for debug packet output (issue #5595) diff --git a/apps/app_queue.c b/apps/app_queue.c index 7fcffd71c..ae622f05a 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2022,7 +2022,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce cur = qe->parent->members; if (!ast_strlen_zero(qe->announce)) announce = qe->announce; - if (announceoverride && !ast_strlen_zero(announceoverride)) + if (!ast_strlen_zero(announceoverride)) announce = announceoverride; while(cur) { @@ -2201,7 +2201,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce } /* Drop out of the queue at this point, to prepare for next caller */ leave_queue(qe); - if (url && !ast_strlen_zero(url) && ast_channel_supports_html(peer)) { + if (!ast_strlen_zero(url) && ast_channel_supports_html(peer)) { if (option_debug) ast_log(LOG_DEBUG, "app_queue: sendurl=%s.\n", url); ast_channel_sendurl(peer, url); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index c6c6f8ae7..f12b3b8a8 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3658,7 +3658,7 @@ static int play_message_callerid(struct ast_channel *chan, struct vm_state *vms, /* Strip off caller ID number from name */ ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context); ast_callerid_parse(cid, &name, &callerid); - if ((callerid != NULL)&&(!res)&&(!ast_strlen_zero(callerid))){ + if ((!res)&&(!ast_strlen_zero(callerid))){ /* Check for internal contexts and only */ /* say extension when the call didn't come from an internal context in the list */ for (i = 0 ; i < MAX_NUM_CID_CONTEXTS ; i++){ diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c index f016cb514..a199d4e02 100755 --- a/apps/app_zapscan.c +++ b/apps/app_zapscan.c @@ -305,7 +305,8 @@ static int conf_exec(struct ast_channel *chan, void *data) if (chan->_state != AST_STATE_UP) ast_answer(chan); - if((desired_group = ast_strdupa((char *) data)) && !ast_strlen_zero(desired_group)) { + desired_group = ast_strdupa((char *) data); + if(!ast_strlen_zero(desired_group)) { ast_verbose(VERBOSE_PREFIX_3 "Scanning for group %s\n", desired_group); search_group = 1; } diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 6496dea71..09cd87513 100755 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -3466,7 +3466,7 @@ static int misdn_facility_exec(struct ast_channel *chan, void *data) return -1; } - if (!data || ast_strlen_zero((char *)data)) { + if (ast_strlen_zero((char *)data)) { ast_log(LOG_WARNING, "misdn_facility Requires arguments\n"); return -1; } @@ -3509,7 +3509,7 @@ static int misdn_set_opt_exec(struct ast_channel *chan, void *data) return -1; } - if (!data || ast_strlen_zero((char *)data)) { + if (ast_strlen_zero((char *)data)) { ast_log(LOG_WARNING, "misdn_set_opt Requires arguments\n"); return -1; } diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7985d0633..29fdfa23a 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4845,14 +4845,14 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init) add_header(&req, "Referred-By", p->referred_by); } #ifdef OSP_SUPPORT - if (p->options && p->options->osptoken && !ast_strlen_zero(p->options->osptoken)) { + if (p->options && !ast_strlen_zero(p->options->osptoken)) { ast_log(LOG_DEBUG,"Adding OSP Token: %s\n", p->options->osptoken); add_header(&req, "P-OSP-Auth-Token", p->options->osptoken); } else { ast_log(LOG_DEBUG,"NOT Adding OSP Token\n"); } #endif - if (p->options && p->options->distinctive_ring && !ast_strlen_zero(p->options->distinctive_ring)) + if (p->options && !ast_strlen_zero(p->options->distinctive_ring)) { add_header(&req, "Alert-Info", p->options->distinctive_ring); } diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c index 66bef4551..3e4696e18 100755 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -45,7 +45,7 @@ static char *builtin_function_cdr_read(struct ast_channel *chan, char *cmd, char char *argv[2]; int recursive = 0; - if (!data || ast_strlen_zero(data)) + if (ast_strlen_zero(data)) return NULL; if (!chan->cdr) @@ -73,7 +73,7 @@ static void builtin_function_cdr_write(struct ast_channel *chan, char *cmd, char char *argv[2]; int recursive = 0; - if (!data || ast_strlen_zero(data) || !value) + if (ast_strlen_zero(data) || !value) return; mydata = ast_strdupa(data); diff --git a/funcs/func_db.c b/funcs/func_db.c index a01af59c1..bc135a6b3 100755 --- a/funcs/func_db.c +++ b/funcs/func_db.c @@ -49,7 +49,7 @@ static char *function_db_read(struct ast_channel *chan, char *cmd, char *data, c char *family; char *key; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "DB requires an argument, DB(<family>/<key>)\n"); return buf; } @@ -82,7 +82,7 @@ static void function_db_write(struct ast_channel *chan, char *cmd, char *data, c char *family; char *key; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "DB requires an argument, DB(<family>/<key>)=<value>\n"); return; } @@ -128,7 +128,7 @@ static char *function_db_exists(struct ast_channel *chan, char *cmd, char *data, char *family; char *key; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "DB_EXISTS requires an argument, DB(<family>/<key>)\n"); return buf; } diff --git a/funcs/func_enum.c b/funcs/func_enum.c index 2d5d21962..8034be878 100755 --- a/funcs/func_enum.c +++ b/funcs/func_enum.c @@ -64,7 +64,7 @@ static char *function_enum(struct ast_channel *chan, char *cmd, char *data, char int i = 0; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, synopsis); return ""; } @@ -166,7 +166,7 @@ static char *function_txtcidname(struct ast_channel *chan, char *cmd, char *data buf[0] = '\0'; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "TXTCIDNAME requires an argument (number)\n"); LOCAL_USER_REMOVE(u); return buf; diff --git a/funcs/func_env.c b/funcs/func_env.c index 424f7cf0d..4906c7d11 100755 --- a/funcs/func_env.c +++ b/funcs/func_env.c @@ -50,8 +50,8 @@ static char *builtin_function_env_read(struct ast_channel *chan, char *cmd, char static void builtin_function_env_write(struct ast_channel *chan, char *cmd, char *data, const char *value) { - if (data && !ast_strlen_zero(data)) { - if (value && !ast_strlen_zero(value)) { + if (!ast_strlen_zero(data)) { + if (!ast_strlen_zero(value)) { setenv(data, value, 1); } else { unsetenv(data); diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index 0559aae29..297422985 100755 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -102,7 +102,7 @@ static char *group_function_read(struct ast_channel *chan, char *cmd, char *data char varname[256]; char *group; - if (data && !ast_strlen_zero(data)) { + if (!ast_strlen_zero(data)) { snprintf(varname, sizeof(varname), "%s_%s", GROUP_CATEGORY_PREFIX, data); } else { ast_copy_string(varname, GROUP_CATEGORY_PREFIX, sizeof(varname)); @@ -119,7 +119,7 @@ static void group_function_write(struct ast_channel *chan, char *cmd, char *data { char grpcat[256]; - if (data && !ast_strlen_zero(data)) { + if (!ast_strlen_zero(data)) { snprintf(grpcat, sizeof(grpcat), "%s@%s", value, data); } else { ast_copy_string(grpcat, value, sizeof(grpcat)); diff --git a/funcs/func_logic.c b/funcs/func_logic.c index a195eca43..f748ba939 100755 --- a/funcs/func_logic.c +++ b/funcs/func_logic.c @@ -64,7 +64,7 @@ static char *builtin_function_iftime(struct ast_channel *chan, char *cmd, char * iftrue = strsep(&data, ":"); iffalse = data; - if (!expr || ast_strlen_zero(expr) || !(iftrue || iffalse)) { + if (ast_strlen_zero(expr) || !(iftrue || iffalse)) { ast_log(LOG_WARNING, "Syntax IFTIME(<timespec>?[<true>][:<false>])\n"); return NULL; } @@ -104,7 +104,7 @@ static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data iftrue = strsep(&data, ":"); iffalse = data; - if (!expr || ast_strlen_zero(expr) || !(iftrue || iffalse)) { + if (ast_strlen_zero(expr) || !(iftrue || iffalse)) { ast_log(LOG_WARNING, "Syntax IF(<expr>?[<true>][:<false>])\n"); return NULL; } @@ -136,7 +136,7 @@ static char *builtin_function_set(struct ast_channel *chan, char *cmd, char *dat varname = strsep(&data, "="); val = data; - if (!varname || ast_strlen_zero(varname) || !val) { + if (ast_strlen_zero(varname) || !val) { ast_log(LOG_WARNING, "Syntax SET(<varname>=[<value>])\n"); return NULL; } diff --git a/funcs/func_math.c b/funcs/func_math.c index 46085275d..e53eb4023 100755 --- a/funcs/func_math.c +++ b/funcs/func_math.c @@ -78,7 +78,7 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da char *mvalue1, *mvalue2=NULL, *mtype_of_result; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n"); return NULL; } diff --git a/funcs/func_md5.c b/funcs/func_md5.c index fed75722c..910e44260 100755 --- a/funcs/func_md5.c +++ b/funcs/func_md5.c @@ -40,7 +40,7 @@ static char *builtin_function_md5(struct ast_channel *chan, char *cmd, char *dat { char md5[33]; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Syntax: MD5(<data>) - missing argument!\n"); return NULL; } diff --git a/funcs/func_strings.c b/funcs/func_strings.c index d527e8256..ab9474d9b 100755 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -160,7 +160,7 @@ static char *acf_strftime(struct ast_channel *chan, char *cmd, char *data, char epoch = strsep(&format, "|"); timezone = strsep(&format, "|"); - if (!epoch || ast_strlen_zero(epoch) || !sscanf(epoch, "%ld", &epochi)) { + if (ast_strlen_zero(epoch) || !sscanf(epoch, "%ld", &epochi)) { struct timeval tv = ast_tvnow(); epochi = tv.tv_sec; } @@ -193,7 +193,7 @@ static char *function_eval(struct ast_channel *chan, char *cmd, char *data, char { memset(buf, 0, len); - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "EVAL requires an argument: EVAL(<string>)\n"); return buf; } diff --git a/funcs/func_uri.c b/funcs/func_uri.c index bd1fee4f5..f75023c5f 100755 --- a/funcs/func_uri.c +++ b/funcs/func_uri.c @@ -45,7 +45,7 @@ static char *builtin_function_uriencode(struct ast_channel *chan, char *cmd, cha { char uri[BUFSIZ]; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Syntax: URIENCODE(<data>) - missing argument!\n"); return NULL; } @@ -59,7 +59,7 @@ static char *builtin_function_uriencode(struct ast_channel *chan, char *cmd, cha /*!\brief builtin_function_uridecode: Decode URI according to RFC 2396 */ static char *builtin_function_uridecode(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) { - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Syntax: URIDECODE(<data>) - missing argument!\n"); return NULL; } diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index ce2d85851..9350ff49b 100755 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -496,7 +496,7 @@ static int __build_step(const char *what, const char *name, const char *filename data = c; data = ast_skip_blanks(data); } - if (!data || ast_strlen_zero(data)) + if (ast_strlen_zero(data)) return 0; if (matches_keyword(data, "switch")) { fillin = NULL; diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index c7e68f788..81559309d 100755 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -1568,7 +1568,7 @@ static int handle_command_response(struct dundi_transaction *trans, struct dundi if (cmd == DUNDI_COMMAND_EIDQUERY) { res = dundi_answer_entity(trans, &ies, ies.called_context); } else { - if (!ies.called_number || ast_strlen_zero(ies.called_number)) { + if (ast_strlen_zero(ies.called_number)) { /* They're not permitted to access that context */ dundi_ie_append_cause(&ied, DUNDI_IE_CAUSE, DUNDI_CAUSE_GENERAL, "Invalid or missing number/entity"); dundi_send(trans, resp, 0, 1, &ied); @@ -3872,7 +3872,7 @@ static int dundi_lookup_exec(struct ast_channel *chan, void *data) dep_warning = 1; } - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "DUNDiLookup requires an argument (number)\n"); LOCAL_USER_REMOVE(u); return 0; @@ -3898,7 +3898,7 @@ static int dundi_lookup_exec(struct ast_channel *chan, void *data) } } - if (!context || ast_strlen_zero(context)) + if (ast_strlen_zero(context)) context = "e164"; results = dundi_lookup(dr, MAX_RESULTS, NULL, context, num, bypass); @@ -3934,7 +3934,7 @@ static char *dundifunc_read(struct ast_channel *chan, char *cmd, char *data, cha buf[0] = '\0'; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "DUNDILOOKUP requires an argument (number)\n"); LOCAL_USER_REMOVE(u); return buf; @@ -3960,7 +3960,7 @@ static char *dundifunc_read(struct ast_channel *chan, char *cmd, char *data, cha } } - if (!context || ast_strlen_zero(context)) + if (ast_strlen_zero(context)) context = "e164"; results = dundi_lookup(dr, MAX_RESULTS, NULL, context, num, bypass); @@ -4447,19 +4447,19 @@ static int dundi_helper(struct ast_channel *chan, const char *context, const cha /* If done as a macro, use macro extension */ if (!strcasecmp(exten, "s")) { exten = pbx_builtin_getvar_helper(chan, "ARG1"); - if (!exten || ast_strlen_zero(exten)) + if (ast_strlen_zero(exten)) exten = chan->macroexten; - if (!exten || ast_strlen_zero(exten)) + if (ast_strlen_zero(exten)) exten = chan->exten; - if (!exten || ast_strlen_zero(exten)) { + if (ast_strlen_zero(exten)) { ast_log(LOG_WARNING, "Called in Macro mode with no ARG1 or MACRO_EXTEN?\n"); return -1; } } - if (!data || ast_strlen_zero(data)) + if (ast_strlen_zero(data)) data = "e164"; } else { - if (!data || ast_strlen_zero(data)) + if (ast_strlen_zero(data)) data = context; } res = dundi_lookup(results, MAX_RESULTS, chan, data, exten, 0); @@ -4498,19 +4498,19 @@ static int dundi_exec(struct ast_channel *chan, const char *context, const char /* If done as a macro, use macro extension */ if (!strcasecmp(exten, "s")) { exten = pbx_builtin_getvar_helper(chan, "ARG1"); - if (!exten || ast_strlen_zero(exten)) + if (ast_strlen_zero(exten)) exten = chan->macroexten; - if (!exten || ast_strlen_zero(exten)) + if (ast_strlen_zero(exten)) exten = chan->exten; - if (!exten || ast_strlen_zero(exten)) { + if (ast_strlen_zero(exten)) { ast_log(LOG_WARNING, "Called in Macro mode with no ARG1 or MACRO_EXTEN?\n"); return -1; } } - if (!data || ast_strlen_zero(data)) + if (ast_strlen_zero(data)) data = "e164"; } else { - if (!data || ast_strlen_zero(data)) + if (ast_strlen_zero(data)) data = context; } res = dundi_lookup(results, MAX_RESULTS, chan, data, exten, 0); diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index 6fa35f2db..2abc11735 100755 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -122,9 +122,9 @@ static void loopback_subst(char **newexten, char **newcontext, int *priority, ch pri = strchr(buf, ':'); if (!ast_strlen_zero(buf)) *newexten = buf; - if (con && !ast_strlen_zero(con)) + if (!ast_strlen_zero(con)) *newcontext = con; - if (pri && !ast_strlen_zero(pri)) + if (!ast_strlen_zero(pri)) sscanf(pri, "%d", priority); } diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index af44f51e2..6b1c4511a 100755 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -97,9 +97,9 @@ static char *tdesc = "Realtime Switch"; table++;\ cxt = buf; \ } else cxt = NULL; \ - if (!cxt || ast_strlen_zero(cxt)) \ + if (ast_strlen_zero(cxt)) \ cxt = context;\ - if (!table || ast_strlen_zero(table)) \ + if (ast_strlen_zero(table)) \ table = "extensions"; \ var = realtime_switch_common(table, cxt, exten, priority, mode); \ } else \ diff --git a/res/res_agi.c b/res/res_agi.c index de3fcf0f7..9ec6f5cb6 100755 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -2009,7 +2009,7 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int char *stringp; AGI agi; - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "AGI requires an argument (script)\n"); return -1; } diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index 10b3dab9f..bd19c6301 100755 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -168,7 +168,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl stringp = rowdata; while(stringp) { chunk = strsep(&stringp, ";"); - if (chunk && !ast_strlen_zero(ast_strip(chunk))) { + if (!ast_strlen_zero(ast_strip(chunk))) { if (prev) { prev->next = ast_variable_new(coltitle, chunk); if (prev->next) @@ -320,7 +320,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char * stringp = rowdata; while(stringp) { chunk = strsep(&stringp, ";"); - if (chunk && !ast_strlen_zero(ast_strip(chunk))) { + if (!ast_strlen_zero(ast_strip(chunk))) { if (initfield && !strcmp(initfield, coltitle)) ast_category_rename(cat, chunk); var = ast_variable_new(coltitle, chunk); diff --git a/res/res_features.c b/res/res_features.c index 8e3be8d01..5ac3cdac0 100755 --- a/res/res_features.c +++ b/res/res_features.c @@ -183,7 +183,7 @@ static void check_goto_on_transfer(struct ast_channel *chan) goto_on_transfer = pbx_builtin_getvar_helper(chan, "GOTO_ON_BLINDXFR"); - if (goto_on_transfer && !ast_strlen_zero(goto_on_transfer) && (xferchan = ast_channel_alloc(0))) { + if (!ast_strlen_zero(goto_on_transfer) && (xferchan = ast_channel_alloc(0))) { char *x; struct ast_frame *f; @@ -1002,7 +1002,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p } - if (dynamic_features && !ast_strlen_zero(dynamic_features)) { + if (!ast_strlen_zero(dynamic_features)) { char *tmp = ast_strdupa(dynamic_features); char *tok; @@ -1868,7 +1868,7 @@ static int manager_parking_status( struct mansession *s, struct message *m ) char *id = astman_get_header(m,"ActionID"); char idText[256] = ""; - if (id && !ast_strlen_zero(id)) + if (!ast_strlen_zero(id)) snprintf(idText,256,"ActionID: %s\r\n",id); astman_send_ack(s, m, "Parked calls will follow"); diff --git a/res/res_monitor.c b/res/res_monitor.c index 89fb5aef9..35366bdf0 100755 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -123,7 +123,7 @@ int ast_monitor_start( struct ast_channel *chan, const char *format_spec, memset(monitor, 0, sizeof(struct ast_channel_monitor)); /* Determine file names */ - if (fname_base && !ast_strlen_zero(fname_base)) { + if (!ast_strlen_zero(fname_base)) { int directory = strchr(fname_base, '/') ? 1 : 0; /* try creating the directory just in case it doesn't exist */ if (directory) { @@ -162,7 +162,7 @@ int ast_monitor_start( struct ast_channel *chan, const char *format_spec, monitor->stop = ast_monitor_stop; /* Determine file format */ - if (format_spec && !ast_strlen_zero(format_spec)) { + if (!ast_strlen_zero(format_spec)) { monitor->format = strdup(format_spec); } else { monitor->format = strdup("wav"); @@ -264,12 +264,12 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock) /* Set the execute application */ execute = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC"); - if (!execute || ast_strlen_zero(execute)) { + if (ast_strlen_zero(execute)) { execute = "nice -n 19 soxmix"; delfiles = 1; } execute_args = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC_ARGS"); - if (!execute_args || ast_strlen_zero(execute_args)) { + if (ast_strlen_zero(execute_args)) { execute_args = ""; } @@ -297,7 +297,7 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock) int ast_monitor_change_fname(struct ast_channel *chan, const char *fname_base, int need_lock) { char tmp[256]; - if ((!fname_base) || (ast_strlen_zero(fname_base))) { + if (ast_strlen_zero(fname_base)) { ast_log(LOG_WARNING, "Cannot change monitor filename of channel %s to null", chan->name); return -1; } @@ -344,7 +344,7 @@ static int start_monitor_exec(struct ast_channel *chan, void *data) int res = 0; /* Parse arguments. */ - if (data && !ast_strlen_zero((char*)data)) { + if (!ast_strlen_zero((char*)data)) { arg = ast_strdupa((char*)data); format = arg; fname_base = strchr(arg, '|'); @@ -433,7 +433,7 @@ static int start_monitor_action(struct mansession *s, struct message *m) char *mix = astman_get_header(m, "Mix"); char *d; - if ((!name) || (ast_strlen_zero(name))) { + if (ast_strlen_zero(name)) { astman_send_error(s, m, "No channel specified"); return 0; } @@ -443,7 +443,7 @@ static int start_monitor_action(struct mansession *s, struct message *m) return 0; } - if ((!fname) || (ast_strlen_zero(fname))) { + if (ast_strlen_zero(fname)) { /* No filename base specified, default to channel name as per CLI */ fname = malloc (FILENAME_MAX); if (!fname) { @@ -484,7 +484,7 @@ static int stop_monitor_action(struct mansession *s, struct message *m) struct ast_channel *c = NULL; char *name = astman_get_header(m, "Channel"); int res; - if ((!name) || (ast_strlen_zero(name))) { + if (ast_strlen_zero(name)) { astman_send_error(s, m, "No channel specified"); return 0; } @@ -516,11 +516,11 @@ static int change_monitor_action(struct mansession *s, struct message *m) struct ast_channel *c = NULL; char *name = astman_get_header(m, "Channel"); char *fname = astman_get_header(m, "File"); - if ((!name) || (ast_strlen_zero(name))) { + if (ast_strlen_zero(name)) { astman_send_error(s, m, "No channel specified"); return 0; } - if ((!fname)||(ast_strlen_zero(fname))) { + if (ast_strlen_zero(fname)) { astman_send_error(s, m, "No filename specified"); return 0; } diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index e029265dd..2939659dc 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -361,7 +361,7 @@ static int spawn_mp3(struct mohclass *class) /* Look for extra arguments and add them to the list */ strncpy(xargs, class->args, sizeof(xargs) - 1); argptr = xargs; - while (argptr && !ast_strlen_zero(argptr)) { + while (!ast_strlen_zero(argptr)) { argv[argc++] = argptr; argptr = strchr(argptr, ','); if (argptr) { @@ -373,7 +373,7 @@ static int spawn_mp3(struct mohclass *class) /* Format arguments for argv vector */ strncpy(xargs, class->args, sizeof(xargs) - 1); argptr = xargs; - while (argptr && !ast_strlen_zero(argptr)) { + while (!ast_strlen_zero(argptr)) { argv[argc++] = argptr; argptr = strchr(argptr, ' '); if (argptr) { @@ -569,7 +569,7 @@ static int moh1_exec(struct ast_channel *chan, void *data) static int moh2_exec(struct ast_channel *chan, void *data) { - if (!data || ast_strlen_zero(data)) { + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "SetMusicOnHold requires an argument (class)\n"); return -1; } @@ -865,9 +865,9 @@ static int local_ast_moh_start(struct ast_channel *chan, char *class) { struct mohclass *mohclass; - if (!class || ast_strlen_zero(class)) + if (ast_strlen_zero(class)) class = chan->musicclass; - if (!class || ast_strlen_zero(class)) + if (ast_strlen_zero(class)) class = "default"; ast_mutex_lock(&moh_lock); mohclass = get_mohbyname(class); |