mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 03:48:02 +00:00
issue #5648
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user