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

formatting fixes (bug #4736)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6162 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-07-19 15:54:17 +00:00
parent 4817bc599d
commit 324f7d150f
1 changed files with 60 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pbx.c
View File

@@ -226,9 +226,7 @@ static struct pbx_builtin {
} builtins[] = } builtins[] =
{ {
/* These applications are built into the PBX core and do not /* These applications are built into the PBX core and do not
need separate modules need separate modules */
*/
{ "AbsoluteTimeout", pbx_builtin_atimeout, { "AbsoluteTimeout", pbx_builtin_atimeout,
"Set absolute maximum time of call", "Set absolute maximum time of call",
@@ -763,7 +761,6 @@ static int matchcid(const char *cidpattern, const char *callerid)
/* If the Caller*ID pattern is empty, then we're matching NO Caller*ID, so /* If the Caller*ID pattern is empty, then we're matching NO Caller*ID, so
failing to get a number should count as a match, otherwise not */ failing to get a number should count as a match, otherwise not */
if (!ast_strlen_zero(cidpattern)) if (!ast_strlen_zero(cidpattern))
failresult = 0; failresult = 0;
else else
@@ -1281,7 +1278,7 @@ int ast_custom_function_register(struct ast_custom_function *acf)
/* try to lock functions list ... */ /* try to lock functions list ... */
if (ast_mutex_lock(&acflock)) { if (ast_mutex_lock(&acflock)) {
ast_log(LOG_ERROR, "Unable to lock function list\n"); ast_log(LOG_ERROR, "Unable to lock function list. Failed registering function %s\n", acf->name);
return -1; return -1;
} }
@@ -1309,7 +1306,10 @@ char *ast_func_read(struct ast_channel *chan, const char *in, char *workspace, s
struct ast_custom_function *acfptr; struct ast_custom_function *acfptr;
function = ast_strdupa(in); function = ast_strdupa(in);
if (function) { if (!function) {
ast_log(LOG_ERROR, "Out of memory\n");
return ret;
}
if ((args = strchr(function, '('))) { if ((args = strchr(function, '('))) {
*args = '\0'; *args = '\0';
args++; args++;
@@ -1332,9 +1332,6 @@ char *ast_func_read(struct ast_channel *chan, const char *in, char *workspace, s
} else { } else {
ast_log(LOG_ERROR, "Function %s not registered\n", function); ast_log(LOG_ERROR, "Function %s not registered\n", function);
} }
} else {
ast_log(LOG_ERROR, "Out of memory\n");
}
return ret; return ret;
} }
@@ -1344,7 +1341,10 @@ void ast_func_write(struct ast_channel *chan, const char *in, const char *value)
struct ast_custom_function *acfptr; struct ast_custom_function *acfptr;
function = ast_strdupa(in); function = ast_strdupa(in);
if (function) { if (!function) {
ast_log(LOG_ERROR, "Out of memory\n");
return;
}
if ((args = strchr(function, '('))) { if ((args = strchr(function, '('))) {
*args = '\0'; *args = '\0';
args++; args++;
@@ -1362,14 +1362,11 @@ void ast_func_write(struct ast_channel *chan, const char *in, const char *value)
if (acfptr->write) { if (acfptr->write) {
acfptr->write(chan, function, args, value); acfptr->write(chan, function, args, value);
} else { } else {
ast_log(LOG_ERROR, "Function %s cannot be written to\n", function); ast_log(LOG_ERROR, "Function %s is read-only, it cannot be written to\n", function);
} }
} else { } else {
ast_log(LOG_ERROR, "Function %s not registered\n", function); ast_log(LOG_ERROR, "Function %s not registered\n", function);
} }
} else {
ast_log(LOG_ERROR, "Out of memory\n");
}
} }
static void pbx_substitute_variables_helper_full(struct ast_channel *c, const char *cp1, char *cp2, int count, struct varshead *headp) static void pbx_substitute_variables_helper_full(struct ast_channel *c, const char *cp1, char *cp2, int count, struct varshead *headp)