kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue #5648

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-11-08 01:55:31 +00:00
parent 2ea48ce114
commit a0a9769616
25 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2005-11-07 Kevin P. Fleming <kpfleming@digium.com> 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) * 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) * rtp.c: use unsigned format for debug packet output (issue #5595)

4
apps/app_queue.c
View File

@@ -2022,7 +2022,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
cur = qe->parent->members; cur = qe->parent->members;
if (!ast_strlen_zero(qe->announce)) if (!ast_strlen_zero(qe->announce))
announce = qe->announce; announce = qe->announce;
if (announceoverride && !ast_strlen_zero(announceoverride)) if (!ast_strlen_zero(announceoverride))
announce = announceoverride; announce = announceoverride;
while(cur) { 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 */ /* Drop out of the queue at this point, to prepare for next caller */
leave_queue(qe); 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) if (option_debug)
ast_log(LOG_DEBUG, "app_queue: sendurl=%s.\n", url); ast_log(LOG_DEBUG, "app_queue: sendurl=%s.\n", url);
ast_channel_sendurl(peer, url); ast_channel_sendurl(peer, url);

2
apps/app_voicemail.c
View File

@@ -3658,7 +3658,7 @@ static int play_message_callerid(struct ast_channel *chan, struct vm_state *vms,
/* Strip off caller ID number from name */ /* Strip off caller ID number from name */
ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context); ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context);
ast_callerid_parse(cid, &name, &callerid); 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 */ /* Check for internal contexts and only */
/* say extension when the call didn't come from an internal context in the list */ /* say extension when the call didn't come from an internal context in the list */
for (i = 0 ; i < MAX_NUM_CID_CONTEXTS ; i++){ for (i = 0 ; i < MAX_NUM_CID_CONTEXTS ; i++){

3
apps/app_zapscan.c
View File

@@ -305,7 +305,8 @@ static int conf_exec(struct ast_channel *chan, void *data)
if (chan->_state != AST_STATE_UP) if (chan->_state != AST_STATE_UP)
ast_answer(chan); 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); ast_verbose(VERBOSE_PREFIX_3 "Scanning for group %s\n", desired_group);
search_group = 1; search_group = 1;
} }

4
channels/chan_misdn.c
View File

@@ -3466,7 +3466,7 @@ static int misdn_facility_exec(struct ast_channel *chan, void *data)
return -1; return -1;
} }
if (!data || ast_strlen_zero((char *)data)) { if (ast_strlen_zero((char *)data)) {
ast_log(LOG_WARNING, "misdn_facility Requires arguments\n"); ast_log(LOG_WARNING, "misdn_facility Requires arguments\n");
return -1; return -1;
} }
@@ -3509,7 +3509,7 @@ static int misdn_set_opt_exec(struct ast_channel *chan, void *data)
return -1; 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"); ast_log(LOG_WARNING, "misdn_set_opt Requires arguments\n");
return -1; return -1;
} }

4
channels/chan_sip.c
View File

@@ -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); add_header(&req, "Referred-By", p->referred_by);
} }
#ifdef OSP_SUPPORT #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); ast_log(LOG_DEBUG,"Adding OSP Token: %s\n", p->options->osptoken);
add_header(&req, "P-OSP-Auth-Token", p->options->osptoken); add_header(&req, "P-OSP-Auth-Token", p->options->osptoken);
} else { } else {
ast_log(LOG_DEBUG,"NOT Adding OSP Token\n"); ast_log(LOG_DEBUG,"NOT Adding OSP Token\n");
} }
#endif #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); add_header(&req, "Alert-Info", p->options->distinctive_ring);
} }

4
funcs/func_cdr.c
View File

@@ -45,7 +45,7 @@ static char *builtin_function_cdr_read(struct ast_channel *chan, char *cmd, char
char *argv[2]; char *argv[2];
int recursive = 0; int recursive = 0;
if (!data || ast_strlen_zero(data)) if (ast_strlen_zero(data))
return NULL; return NULL;
if (!chan->cdr) if (!chan->cdr)
@@ -73,7 +73,7 @@ static void builtin_function_cdr_write(struct ast_channel *chan, char *cmd, char
char *argv[2]; char *argv[2];
int recursive = 0; int recursive = 0;
if (!data || ast_strlen_zero(data) || !value) if (ast_strlen_zero(data) || !value)
return; return;
mydata = ast_strdupa(data); mydata = ast_strdupa(data);

6
funcs/func_db.c
View File

@@ -49,7 +49,7 @@ static char *function_db_read(struct ast_channel *chan, char *cmd, char *data, c
char *family; char *family;
char *key; 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"); ast_log(LOG_WARNING, "DB requires an argument, DB(<family>/<key>)\n");
return buf; return buf;
} }
@@ -82,7 +82,7 @@ static void function_db_write(struct ast_channel *chan, char *cmd, char *data, c
char *family; char *family;
char *key; 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"); ast_log(LOG_WARNING, "DB requires an argument, DB(<family>/<key>)=<value>\n");
return; return;
} }
@@ -128,7 +128,7 @@ static char *function_db_exists(struct ast_channel *chan, char *cmd, char *data,
char *family; char *family;
char *key; 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"); ast_log(LOG_WARNING, "DB_EXISTS requires an argument, DB(<family>/<key>)\n");
return buf; return buf;
} }

4
funcs/func_enum.c
View File

@@ -64,7 +64,7 @@ static char *function_enum(struct ast_channel *chan, char *cmd, char *data, char
int i = 0; int i = 0;
if (!data || ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, synopsis); ast_log(LOG_WARNING, synopsis);
return ""; return "";
} }
@@ -166,7 +166,7 @@ static char *function_txtcidname(struct ast_channel *chan, char *cmd, char *data
buf[0] = '\0'; buf[0] = '\0';
if (!data || ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "TXTCIDNAME requires an argument (number)\n"); ast_log(LOG_WARNING, "TXTCIDNAME requires an argument (number)\n");
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return buf; return buf;

4
funcs/func_env.c
View File

@@ -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) static void builtin_function_env_write(struct ast_channel *chan, char *cmd, char *data, const char *value)
{ {
if (data && !ast_strlen_zero(data)) { if (!ast_strlen_zero(data)) {
if (value && !ast_strlen_zero(value)) { if (!ast_strlen_zero(value)) {
setenv(data, value, 1); setenv(data, value, 1);
} else { } else {
unsetenv(data); unsetenv(data);

4
funcs/func_groupcount.c
View File

@@ -102,7 +102,7 @@ static char *group_function_read(struct ast_channel *chan, char *cmd, char *data
char varname[256]; char varname[256];
char *group; char *group;
if (data && !ast_strlen_zero(data)) { if (!ast_strlen_zero(data)) {
snprintf(varname, sizeof(varname), "%s_%s", GROUP_CATEGORY_PREFIX, data); snprintf(varname, sizeof(varname), "%s_%s", GROUP_CATEGORY_PREFIX, data);
} else { } else {
ast_copy_string(varname, GROUP_CATEGORY_PREFIX, sizeof(varname)); 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]; char grpcat[256];
if (data && !ast_strlen_zero(data)) { if (!ast_strlen_zero(data)) {
snprintf(grpcat, sizeof(grpcat), "%s@%s", value, data); snprintf(grpcat, sizeof(grpcat), "%s@%s", value, data);
} else { } else {
ast_copy_string(grpcat, value, sizeof(grpcat)); ast_copy_string(grpcat, value, sizeof(grpcat));

6
funcs/func_logic.c
View File

@@ -64,7 +64,7 @@ static char *builtin_function_iftime(struct ast_channel *chan, char *cmd, char *
iftrue = strsep(&data, ":"); iftrue = strsep(&data, ":");
iffalse = 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"); ast_log(LOG_WARNING, "Syntax IFTIME(<timespec>?[<true>][:<false>])\n");
return NULL; return NULL;
} }
@@ -104,7 +104,7 @@ static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data
iftrue = strsep(&data, ":"); iftrue = strsep(&data, ":");
iffalse = 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"); ast_log(LOG_WARNING, "Syntax IF(<expr>?[<true>][:<false>])\n");
return NULL; return NULL;
} }
@@ -136,7 +136,7 @@ static char *builtin_function_set(struct ast_channel *chan, char *cmd, char *dat
varname = strsep(&data, "="); varname = strsep(&data, "=");
val = 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"); ast_log(LOG_WARNING, "Syntax SET(<varname>=[<value>])\n");
return NULL; return NULL;
} }

2
funcs/func_math.c
View File

@@ -78,7 +78,7 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da
char *mvalue1, *mvalue2=NULL, *mtype_of_result; 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"); ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
return NULL; return NULL;
} }

2
funcs/func_md5.c
View File

@@ -40,7 +40,7 @@ static char *builtin_function_md5(struct ast_channel *chan, char *cmd, char *dat
{ {
char md5[33]; char md5[33];
if (!data || ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Syntax: MD5(<data>) - missing argument!\n"); ast_log(LOG_WARNING, "Syntax: MD5(<data>) - missing argument!\n");
return NULL; return NULL;
} }

4
funcs/func_strings.c
View File

@@ -160,7 +160,7 @@ static char *acf_strftime(struct ast_channel *chan, char *cmd, char *data, char
epoch = strsep(&format, "|"); epoch = strsep(&format, "|");
timezone = 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(); struct timeval tv = ast_tvnow();
epochi = tv.tv_sec; 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); 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"); ast_log(LOG_WARNING, "EVAL requires an argument: EVAL(<string>)\n");
return buf; return buf;
} }

4
funcs/func_uri.c
View File

@@ -45,7 +45,7 @@ static char *builtin_function_uriencode(struct ast_channel *chan, char *cmd, cha
{ {
char uri[BUFSIZ]; char uri[BUFSIZ];
if (!data || ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Syntax: URIENCODE(<data>) - missing argument!\n"); ast_log(LOG_WARNING, "Syntax: URIENCODE(<data>) - missing argument!\n");
return NULL; 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 */ /*!\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) 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"); ast_log(LOG_WARNING, "Syntax: URIDECODE(<data>) - missing argument!\n");
return NULL; return NULL;
} }

2
pbx/pbx_ael.c
View File

@@ -496,7 +496,7 @@ static int __build_step(const char *what, const char *name, const char *filename
data = c; data = c;
data = ast_skip_blanks(data); data = ast_skip_blanks(data);
} }
if (!data || ast_strlen_zero(data)) if (ast_strlen_zero(data))
return 0; return 0;
if (matches_keyword(data, "switch")) { if (matches_keyword(data, "switch")) {
fillin = NULL; fillin = NULL;

30
pbx/pbx_dundi.c
View File

@@ -1568,7 +1568,7 @@ static int handle_command_response(struct dundi_transaction *trans, struct dundi
if (cmd == DUNDI_COMMAND_EIDQUERY) { if (cmd == DUNDI_COMMAND_EIDQUERY) {
res = dundi_answer_entity(trans, &ies, ies.called_context); res = dundi_answer_entity(trans, &ies, ies.called_context);
} else { } 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 */ /* 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_ie_append_cause(&ied, DUNDI_IE_CAUSE, DUNDI_CAUSE_GENERAL, "Invalid or missing number/entity");
dundi_send(trans, resp, 0, 1, &ied); 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; dep_warning = 1;
} }
if (!data || ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "DUNDiLookup requires an argument (number)\n"); ast_log(LOG_WARNING, "DUNDiLookup requires an argument (number)\n");
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return 0; 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"; context = "e164";
results = dundi_lookup(dr, MAX_RESULTS, NULL, context, num, bypass); 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'; buf[0] = '\0';
if (!data || ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "DUNDILOOKUP requires an argument (number)\n"); ast_log(LOG_WARNING, "DUNDILOOKUP requires an argument (number)\n");
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return buf; 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"; context = "e164";
results = dundi_lookup(dr, MAX_RESULTS, NULL, context, num, bypass); 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 done as a macro, use macro extension */
if (!strcasecmp(exten, "s")) { if (!strcasecmp(exten, "s")) {
exten = pbx_builtin_getvar_helper(chan, "ARG1"); exten = pbx_builtin_getvar_helper(chan, "ARG1");
if (!exten || ast_strlen_zero(exten)) if (ast_strlen_zero(exten))
exten = chan->macroexten; exten = chan->macroexten;
if (!exten || ast_strlen_zero(exten)) if (ast_strlen_zero(exten))
exten = chan->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"); ast_log(LOG_WARNING, "Called in Macro mode with no ARG1 or MACRO_EXTEN?\n");
return -1; return -1;
} }
} }
if (!data || ast_strlen_zero(data)) if (ast_strlen_zero(data))
data = "e164"; data = "e164";
} else { } else {
if (!data || ast_strlen_zero(data)) if (ast_strlen_zero(data))
data = context; data = context;
} }
res = dundi_lookup(results, MAX_RESULTS, chan, data, exten, 0); 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 done as a macro, use macro extension */
if (!strcasecmp(exten, "s")) { if (!strcasecmp(exten, "s")) {
exten = pbx_builtin_getvar_helper(chan, "ARG1"); exten = pbx_builtin_getvar_helper(chan, "ARG1");
if (!exten || ast_strlen_zero(exten)) if (ast_strlen_zero(exten))
exten = chan->macroexten; exten = chan->macroexten;
if (!exten || ast_strlen_zero(exten)) if (ast_strlen_zero(exten))
exten = chan->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"); ast_log(LOG_WARNING, "Called in Macro mode with no ARG1 or MACRO_EXTEN?\n");
return -1; return -1;
} }
} }
if (!data || ast_strlen_zero(data)) if (ast_strlen_zero(data))
data = "e164"; data = "e164";
} else { } else {
if (!data || ast_strlen_zero(data)) if (ast_strlen_zero(data))
data = context; data = context;
} }
res = dundi_lookup(results, MAX_RESULTS, chan, data, exten, 0); res = dundi_lookup(results, MAX_RESULTS, chan, data, exten, 0);

4
pbx/pbx_loopback.c
View File

@@ -122,9 +122,9 @@ static void loopback_subst(char **newexten, char **newcontext, int *priority, ch
pri = strchr(buf, ':'); pri = strchr(buf, ':');
if (!ast_strlen_zero(buf)) if (!ast_strlen_zero(buf))
*newexten = buf; *newexten = buf;
if (con && !ast_strlen_zero(con)) if (!ast_strlen_zero(con))
*newcontext = con; *newcontext = con;
if (pri && !ast_strlen_zero(pri)) if (!ast_strlen_zero(pri))
sscanf(pri, "%d", priority); sscanf(pri, "%d", priority);
} }

4
pbx/pbx_realtime.c
View File

@@ -97,9 +97,9 @@ static char *tdesc = "Realtime Switch";
table++;\ table++;\
cxt = buf; \ cxt = buf; \
} else cxt = NULL; \ } else cxt = NULL; \
if (!cxt || ast_strlen_zero(cxt)) \ if (ast_strlen_zero(cxt)) \
cxt = context;\ cxt = context;\
if (!table || ast_strlen_zero(table)) \ if (ast_strlen_zero(table)) \
table = "extensions"; \ table = "extensions"; \
var = realtime_switch_common(table, cxt, exten, priority, mode); \ var = realtime_switch_common(table, cxt, exten, priority, mode); \
} else \ } else \

2
res/res_agi.c
View File

@@ -2009,7 +2009,7 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
char *stringp; char *stringp;
AGI agi; AGI agi;
if (!data || ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "AGI requires an argument (script)\n"); ast_log(LOG_WARNING, "AGI requires an argument (script)\n");
return -1; return -1;
} }

4
res/res_config_odbc.c
View File

@@ -168,7 +168,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
stringp = rowdata; stringp = rowdata;
while(stringp) { while(stringp) {
chunk = strsep(&stringp, ";"); chunk = strsep(&stringp, ";");
if (chunk && !ast_strlen_zero(ast_strip(chunk))) { if (!ast_strlen_zero(ast_strip(chunk))) {
if (prev) { if (prev) {
prev->next = ast_variable_new(coltitle, chunk); prev->next = ast_variable_new(coltitle, chunk);
if (prev->next) if (prev->next)
@@ -320,7 +320,7 @@ static struct ast_config *realtime_multi_odbc(const char *database, const char *
stringp = rowdata; stringp = rowdata;
while(stringp) { while(stringp) {
chunk = strsep(&stringp, ";"); chunk = strsep(&stringp, ";");
if (chunk && !ast_strlen_zero(ast_strip(chunk))) { if (!ast_strlen_zero(ast_strip(chunk))) {
if (initfield && !strcmp(initfield, coltitle)) if (initfield && !strcmp(initfield, coltitle))
ast_category_rename(cat, chunk); ast_category_rename(cat, chunk);
var = ast_variable_new(coltitle, chunk); var = ast_variable_new(coltitle, chunk);

6
res/res_features.c
View File

@@ -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"); 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; char *x;
struct ast_frame *f; 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 *tmp = ast_strdupa(dynamic_features);
char *tok; 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 *id = astman_get_header(m,"ActionID");
char idText[256] = ""; char idText[256] = "";
if (id && !ast_strlen_zero(id)) if (!ast_strlen_zero(id))
snprintf(idText,256,"ActionID: %s\r\n",id); snprintf(idText,256,"ActionID: %s\r\n",id);
astman_send_ack(s, m, "Parked calls will follow"); astman_send_ack(s, m, "Parked calls will follow");

22
res/res_monitor.c
View File

@@ -123,7 +123,7 @@ int ast_monitor_start( struct ast_channel *chan, const char *format_spec,
memset(monitor, 0, sizeof(struct ast_channel_monitor)); memset(monitor, 0, sizeof(struct ast_channel_monitor));
/* Determine file names */ /* Determine file names */
if (fname_base && !ast_strlen_zero(fname_base)) { if (!ast_strlen_zero(fname_base)) {
int directory = strchr(fname_base, '/') ? 1 : 0; int directory = strchr(fname_base, '/') ? 1 : 0;
/* try creating the directory just in case it doesn't exist */ /* try creating the directory just in case it doesn't exist */
if (directory) { if (directory) {
@@ -162,7 +162,7 @@ int ast_monitor_start( struct ast_channel *chan, const char *format_spec,
monitor->stop = ast_monitor_stop; monitor->stop = ast_monitor_stop;
/* Determine file format */ /* Determine file format */
if (format_spec && !ast_strlen_zero(format_spec)) { if (!ast_strlen_zero(format_spec)) {
monitor->format = strdup(format_spec); monitor->format = strdup(format_spec);
} else { } else {
monitor->format = strdup("wav"); monitor->format = strdup("wav");
@@ -264,12 +264,12 @@ int ast_monitor_stop(struct ast_channel *chan, int need_lock)
/* Set the execute application */ /* Set the execute application */
execute = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC"); execute = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC");
if (!execute || ast_strlen_zero(execute)) { if (ast_strlen_zero(execute)) {
execute = "nice -n 19 soxmix"; execute = "nice -n 19 soxmix";
delfiles = 1; delfiles = 1;
} }
execute_args = pbx_builtin_getvar_helper(chan, "MONITOR_EXEC_ARGS"); 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 = ""; 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) int ast_monitor_change_fname(struct ast_channel *chan, const char *fname_base, int need_lock)
{ {
char tmp[256]; 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); ast_log(LOG_WARNING, "Cannot change monitor filename of channel %s to null", chan->name);
return -1; return -1;
} }
@@ -344,7 +344,7 @@ static int start_monitor_exec(struct ast_channel *chan, void *data)
int res = 0; int res = 0;
/* Parse arguments. */ /* Parse arguments. */
if (data && !ast_strlen_zero((char*)data)) { if (!ast_strlen_zero((char*)data)) {
arg = ast_strdupa((char*)data); arg = ast_strdupa((char*)data);
format = arg; format = arg;
fname_base = strchr(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 *mix = astman_get_header(m, "Mix");
char *d; char *d;
if ((!name) || (ast_strlen_zero(name))) { if (ast_strlen_zero(name)) {
astman_send_error(s, m, "No channel specified"); astman_send_error(s, m, "No channel specified");
return 0; return 0;
} }
@@ -443,7 +443,7 @@ static int start_monitor_action(struct mansession *s, struct message *m)
return 0; return 0;
} }
if ((!fname) || (ast_strlen_zero(fname))) { if (ast_strlen_zero(fname)) {
/* No filename base specified, default to channel name as per CLI */ /* No filename base specified, default to channel name as per CLI */
fname = malloc (FILENAME_MAX); fname = malloc (FILENAME_MAX);
if (!fname) { if (!fname) {
@@ -484,7 +484,7 @@ static int stop_monitor_action(struct mansession *s, struct message *m)
struct ast_channel *c = NULL; struct ast_channel *c = NULL;
char *name = astman_get_header(m, "Channel"); char *name = astman_get_header(m, "Channel");
int res; int res;
if ((!name) || (ast_strlen_zero(name))) { if (ast_strlen_zero(name)) {
astman_send_error(s, m, "No channel specified"); astman_send_error(s, m, "No channel specified");
return 0; return 0;
} }
@@ -516,11 +516,11 @@ static int change_monitor_action(struct mansession *s, struct message *m)
struct ast_channel *c = NULL; struct ast_channel *c = NULL;
char *name = astman_get_header(m, "Channel"); char *name = astman_get_header(m, "Channel");
char *fname = astman_get_header(m, "File"); 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"); astman_send_error(s, m, "No channel specified");
return 0; return 0;
} }
if ((!fname)||(ast_strlen_zero(fname))) { if (ast_strlen_zero(fname)) {
astman_send_error(s, m, "No filename specified"); astman_send_error(s, m, "No filename specified");
return 0; return 0;
} }

10
res/res_musiconhold.c
View File

@@ -361,7 +361,7 @@ static int spawn_mp3(struct mohclass *class)
/* Look for extra arguments and add them to the list */ /* Look for extra arguments and add them to the list */
strncpy(xargs, class->args, sizeof(xargs) - 1); strncpy(xargs, class->args, sizeof(xargs) - 1);
argptr = xargs; argptr = xargs;
while (argptr && !ast_strlen_zero(argptr)) { while (!ast_strlen_zero(argptr)) {
argv[argc++] = argptr; argv[argc++] = argptr;
argptr = strchr(argptr, ','); argptr = strchr(argptr, ',');
if (argptr) { if (argptr) {
@@ -373,7 +373,7 @@ static int spawn_mp3(struct mohclass *class)
/* Format arguments for argv vector */ /* Format arguments for argv vector */
strncpy(xargs, class->args, sizeof(xargs) - 1); strncpy(xargs, class->args, sizeof(xargs) - 1);
argptr = xargs; argptr = xargs;
while (argptr && !ast_strlen_zero(argptr)) { while (!ast_strlen_zero(argptr)) {
argv[argc++] = argptr; argv[argc++] = argptr;
argptr = strchr(argptr, ' '); argptr = strchr(argptr, ' ');
if (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) 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"); ast_log(LOG_WARNING, "SetMusicOnHold requires an argument (class)\n");
return -1; return -1;
} }
@@ -865,9 +865,9 @@ static int local_ast_moh_start(struct ast_channel *chan, char *class)
{ {
struct mohclass *mohclass; struct mohclass *mohclass;
if (!class || ast_strlen_zero(class)) if (ast_strlen_zero(class))
class = chan->musicclass; class = chan->musicclass;
if (!class || ast_strlen_zero(class)) if (ast_strlen_zero(class))
class = "default"; class = "default";
ast_mutex_lock(&moh_lock); ast_mutex_lock(&moh_lock);
mohclass = get_mohbyname(class); mohclass = get_mohbyname(class);