remove useless checks of the result of ast_strdupa
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8380 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
3f2c7248c6
commit
41cb10c756
|
@ -64,10 +64,6 @@ static char *builtin_function_cdr_read(struct ast_channel *chan, char *cmd, char
|
|||
return NULL;
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if (!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory!\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
AST_STANDARD_APP_ARGS(args, parse);
|
||||
|
||||
|
@ -93,10 +89,6 @@ static void builtin_function_cdr_write(struct ast_channel *chan, char *cmd, char
|
|||
return;
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if (!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
AST_STANDARD_APP_ARGS(args, parse);
|
||||
|
||||
|
|
|
@ -83,10 +83,7 @@ static int sort_internal(struct ast_channel *chan, char *data, char *buffer, siz
|
|||
return ERROR_NOARG;
|
||||
}
|
||||
|
||||
strings = ast_strdupa((char *)data);
|
||||
if (!strings) {
|
||||
return ERROR_NOMEM;
|
||||
}
|
||||
strings = ast_strdupa(data);
|
||||
|
||||
for (ptrkey = strings; *ptrkey; ptrkey++) {
|
||||
if (*ptrkey == '|') {
|
||||
|
@ -143,10 +140,6 @@ static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size
|
|||
memset(buffer, 0, buflen);
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if (!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory!\n");
|
||||
return ERROR_NOMEM;
|
||||
}
|
||||
|
||||
AST_STANDARD_APP_ARGS(args, parse);
|
||||
|
||||
|
|
|
@ -55,10 +55,7 @@ static char *builtin_function_iftime(struct ast_channel *chan, char *cmd, char *
|
|||
char *iftrue;
|
||||
char *iffalse;
|
||||
|
||||
if (!(data = ast_strdupa(data))) {
|
||||
ast_log(LOG_WARNING, "Memory Error!\n");
|
||||
return NULL;
|
||||
}
|
||||
data = ast_strdupa(data);
|
||||
|
||||
data = ast_strip_quoted(data, "\"", "\"");
|
||||
expr = strsep(&data, "?");
|
||||
|
@ -95,10 +92,7 @@ static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data
|
|||
char *iftrue;
|
||||
char *iffalse;
|
||||
|
||||
if (!(data = ast_strdupa(data))) {
|
||||
ast_log(LOG_WARNING, "Memory Error!\n");
|
||||
return NULL;
|
||||
}
|
||||
data = ast_strdupa(data);
|
||||
|
||||
data = ast_strip_quoted(data, "\"", "\"");
|
||||
expr = strsep(&data, "?");
|
||||
|
@ -129,10 +123,7 @@ static char *builtin_function_set(struct ast_channel *chan, char *cmd, char *dat
|
|||
char *varname;
|
||||
char *val;
|
||||
|
||||
if (!(data = ast_strdupa(data))) {
|
||||
ast_log(LOG_WARNING, "Memory Error!\n");
|
||||
return NULL;
|
||||
}
|
||||
data = ast_strdupa(data);
|
||||
|
||||
varname = strsep(&data, "=");
|
||||
val = data;
|
||||
|
|
|
@ -89,10 +89,6 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da
|
|||
}
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if(!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory!\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
AST_STANDARD_APP_ARGS(args, parse);
|
||||
|
||||
|
|
|
@ -68,10 +68,6 @@ static char *builtin_function_checkmd5(struct ast_channel *chan, char *cmd, char
|
|||
}
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if (!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory!\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
AST_STANDARD_APP_ARGS(args, parse);
|
||||
|
||||
|
|
|
@ -108,12 +108,6 @@ static void acf_odbc_write(struct ast_channel *chan, char *cmd, char *data, cons
|
|||
t = "";
|
||||
}
|
||||
|
||||
if (!s || !t) {
|
||||
ast_log(LOG_ERROR, "Out of memory\n");
|
||||
ast_mutex_unlock(&query_lock);
|
||||
return;
|
||||
}
|
||||
|
||||
/* XXX You might be tempted to change this section into using
|
||||
* pbx_builtin_pushvar_helper(). However, note that if you try
|
||||
* to set a NULL (like for VALUE), then nothing gets set, and the
|
||||
|
@ -266,11 +260,6 @@ static char *acf_odbc_read(struct ast_channel *chan, char *cmd, char *data, char
|
|||
|
||||
/* Parse our arguments */
|
||||
s = ast_strdupa(data);
|
||||
if (!s) {
|
||||
ast_log(LOG_ERROR, "Out of memory\n");
|
||||
ast_mutex_unlock(&query_lock);
|
||||
return "";
|
||||
}
|
||||
|
||||
while ((arg = strsep(&s, "|"))) {
|
||||
count++;
|
||||
|
|
|
@ -55,12 +55,7 @@ static char *acf_rand_exec(struct ast_channel *chan, char *cmd, char *data, char
|
|||
|
||||
LOCAL_USER_ACF_ADD(u);
|
||||
|
||||
if (!(s = ast_strdupa(data))) {
|
||||
ast_log(LOG_WARNING, "Out of memory\n");
|
||||
*buffer = '\0';
|
||||
LOCAL_USER_REMOVE(u);
|
||||
return buffer;
|
||||
}
|
||||
s = ast_strdupa(data);
|
||||
|
||||
ast_app_separate_args(s, '|', args, sizeof(args) / sizeof(args[0]));
|
||||
|
||||
|
|
|
@ -52,11 +52,6 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data,
|
|||
);
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if (!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory\n");
|
||||
ast_copy_string(buf, "0", len);
|
||||
return buf;
|
||||
}
|
||||
|
||||
AST_STANDARD_APP_ARGS(args, parse);
|
||||
if (args.delim) {
|
||||
|
@ -91,10 +86,6 @@ static char *builtin_function_filter(struct ast_channel *chan, char *cmd, char *
|
|||
char *outbuf=buf;
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if (!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory");
|
||||
return "";
|
||||
}
|
||||
|
||||
AST_STANDARD_APP_ARGS(args, parse);
|
||||
|
||||
|
@ -141,10 +132,6 @@ static char *builtin_function_regex(struct ast_channel *chan, char *cmd, char *d
|
|||
ast_copy_string(buf, "0", len);
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if (!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory in %s(%s)\n", cmd, data);
|
||||
return buf;
|
||||
}
|
||||
|
||||
AST_NONSTANDARD_APP_ARGS(args, parse, '"');
|
||||
|
||||
|
@ -185,10 +172,6 @@ static void builtin_function_array(struct ast_channel *chan, char *cmd, char *da
|
|||
|
||||
var = ast_strdupa(data);
|
||||
value2 = ast_strdupa(value);
|
||||
if (!var || !value2) {
|
||||
ast_log(LOG_ERROR, "Out of memory\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* The functions this will generally be used with are SORT and ODBC_*, which
|
||||
* both return comma-delimited lists. However, if somebody uses literal lists,
|
||||
|
@ -277,10 +260,6 @@ static char *acf_strftime(struct ast_channel *chan, char *cmd, char *data, char
|
|||
}
|
||||
|
||||
parse = ast_strdupa(data);
|
||||
if (!parse) {
|
||||
ast_log(LOG_ERROR, "Out of memory\n");
|
||||
return buf;
|
||||
}
|
||||
|
||||
AST_STANDARD_APP_ARGS(args, parse);
|
||||
|
||||
|
|
Reference in New Issue