kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

on this pass, only remove duplicate log messages

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8403 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-01-21 20:57:06 +00:00
parent 41c87ccb97
commit 4414f45393
52 changed files with 78 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
funcs/func_cdr.c
View File

@@ -63,11 +63,8 @@ static char *builtin_function_cdr_read(struct ast_channel *chan, char *cmd, char
if (!chan->cdr)
return NULL;
parse = ast_strdupa(data);
if (!parse) {
ast_log(LOG_ERROR, "Out of memory!\n");
if (!(parse = ast_strdupa(data)))
return NULL;
}
AST_STANDARD_APP_ARGS(args, parse);
@@ -92,11 +89,8 @@ static void builtin_function_cdr_write(struct ast_channel *chan, char *cmd, char
if (ast_strlen_zero(data) || !value)
return;
parse = ast_strdupa(data);
if (!parse) {
ast_log(LOG_ERROR, "Out of memory!\n");
if (!(parse = ast_strdupa(data)))
return;
}
AST_STANDARD_APP_ARGS(args, parse);

9
funcs/func_cut.c
View File

@@ -83,10 +83,8 @@ static int sort_internal(struct ast_channel *chan, char *data, char *buffer, siz
return ERROR_NOARG;
}
strings = ast_strdupa((char *)data);
if (!strings) {
if (!(strings = ast_strdupa(data)))
return ERROR_NOMEM;
}
for (ptrkey = strings; *ptrkey; ptrkey++) {
if (*ptrkey == '|') {
@@ -142,11 +140,8 @@ 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");
if (!(parse = ast_strdupa(data)))
return ERROR_NOMEM;
}
AST_STANDARD_APP_ARGS(args, parse);

12
funcs/func_logic.c
View File

@@ -55,10 +55,8 @@ 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");
if (!(data = ast_strdupa(data)))
return NULL;
}
data = ast_strip_quoted(data, "\"", "\"");
expr = strsep(&data, "?");
@@ -95,10 +93,8 @@ 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");
if (!(data = ast_strdupa(data)))
return NULL;
}
data = ast_strip_quoted(data, "\"", "\"");
expr = strsep(&data, "?");
@@ -129,10 +125,8 @@ 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");
if (!(data = ast_strdupa(data)))
return NULL;
}
varname = strsep(&data, "=");
val = data;

5
funcs/func_math.c
View File

@@ -88,11 +88,8 @@ static char *builtin_function_math(struct ast_channel *chan, char *cmd, char *da
return NULL;
}
parse = ast_strdupa(data);
if(!parse) {
ast_log(LOG_ERROR, "Out of memory!\n");
if (!(parse = ast_strdupa(data)))
return NULL;
}
AST_STANDARD_APP_ARGS(args, parse);

5
funcs/func_md5.c
View File

@@ -67,11 +67,8 @@ static char *builtin_function_checkmd5(struct ast_channel *chan, char *cmd, char
return NULL;
}
parse = ast_strdupa(data);
if (!parse) {
ast_log(LOG_ERROR, "Out of memory!\n");
if (!(parse = ast_strdupa(data)))
return NULL;
}
AST_STANDARD_APP_ARGS(args, parse);

4
funcs/func_odbc.c
View File

@@ -265,9 +265,7 @@ static char *acf_odbc_read(struct ast_channel *chan, char *cmd, char *data, char
#endif
/* Parse our arguments */
s = ast_strdupa(data);
if (!s) {
ast_log(LOG_ERROR, "Out of memory\n");
if (!(s = ast_strdupa(data))) {
ast_mutex_unlock(&query_lock);
return "";
}

1
funcs/func_rand.c
View File

@@ -56,7 +56,6 @@ 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;

23
funcs/func_strings.c
View File

@@ -51,9 +51,7 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data,
AST_APP_ARG(delim);
);
parse = ast_strdupa(data);
if (!parse) {
ast_log(LOG_ERROR, "Out of memory\n");
if (!(parse = ast_strdupa(data))) {
ast_copy_string(buf, "0", len);
return buf;
}
@@ -90,11 +88,8 @@ 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");
if (!(parse = ast_strdupa(data)))
return "";
}
AST_STANDARD_APP_ARGS(args, parse);
@@ -140,11 +135,8 @@ 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);
if (!(parse = ast_strdupa(data)))
return buf;
}
AST_NONSTANDARD_APP_ARGS(args, parse, '"');
@@ -185,10 +177,8 @@ 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");
if (!var || !value2)
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,
@@ -276,11 +266,8 @@ static char *acf_strftime(struct ast_channel *chan, char *cmd, char *data, char
return buf;
}
parse = ast_strdupa(data);
if (!parse) {
ast_log(LOG_ERROR, "Out of memory\n");
if (!(parse = ast_strdupa(data)))
return buf;
}
AST_STANDARD_APP_ARGS(args, parse);