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

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-29 20:06:56 +00:00
parent 9a26882461
commit 99a4cd1de2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_stack.c
View File

@@ -139,7 +139,7 @@ static int gosubif_exec(struct ast_channel *chan, void *data)
label1 = strsep(&args, ":");
label2 = args;
if (ast_true(condition)) {
if (pbx_checkcondition(condition)) {
if (label1) {
res = gosub_exec(chan, label1);
}

3
include/asterisk/pbx.h
View File

@@ -569,6 +569,9 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout
particular application with given extension */
int ast_pbx_outgoing_app(const char *type, int format, void *data, int timeout, const char *app, const char *appdata, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel);
/* Evaluate a condition for non-falseness and return a boolean */
int pbx_checkcondition(char *condition);
/* Functions for returning values from structures */
const char *ast_get_context_name(struct ast_context *con);
const char *ast_get_extension_name(struct ast_exten *exten);

2
pbx.c
View File

@@ -6107,7 +6107,7 @@ void pbx_builtin_clear_globals(void)
ast_mutex_unlock(&globalslock);
}
static int pbx_checkcondition(char *condition)
int pbx_checkcondition(char *condition)
{
if (condition) {
if (*condition == '\0') {