diff options
| -rw-r--r-- | include/asterisk/pbx.h | 2 | ||||
| -rw-r--r-- | main/manager.c | 2 | ||||
| -rw-r--r-- | main/pbx.c | 4 | ||||
| -rw-r--r-- | pbx/pbx_realtime.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index bfa9d3bc9..2fdb5b396 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -999,7 +999,7 @@ struct ast_exten *pbx_find_extension(struct ast_channel *chan, const char *label, const char *callerid, enum ext_match_t action); /*! \brief Function in pbx.c that propably should be somewhere else, but not in res_agi, since it's a loadable module */ -const char *agi_state(struct ast_channel *chan); +const char *ast_agi_state(struct ast_channel *chan); /* every time a write lock is obtained for contexts, diff --git a/main/manager.c b/main/manager.c index fa9240817..679a8899e 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2723,7 +2723,7 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m c->name, c->uniqueid, c->context, c->exten, c->priority, c->_state, ast_state2str(c->_state), c->appl ? c->appl : "", c->data ? S_OR(c->data, ""): "", S_OR(c->cid.cid_num, ""), durbuf, S_OR(c->accountcode, ""), bc ? bc->name : "", bc ? bc->uniqueid : "", - agi_state(c) + ast_agi_state(c) ); ast_channel_unlock(c); numchans++; diff --git a/main/pbx.c b/main/pbx.c index dfd4f5f0b..d0ae17e9b 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2902,7 +2902,7 @@ static void pbx_substitute_variables(char *passdata, int datalen, struct ast_cha } /*! \brief report AGI state for channel */ -const char *agi_state(struct ast_channel *chan) +const char *ast_agi_state(struct ast_channel *chan) { if (ast_test_flag(chan, AST_FLAG_AGI)) return "AGI"; @@ -2995,7 +2995,7 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con, "AppData: %s\r\n" "Uniqueid: %s\r\n" "AGIstate: %s\r\n", - c->name, c->context, c->exten, c->priority, app->name, passdata, c->uniqueid, agi_state(c)); + c->name, c->context, c->exten, c->priority, app->name, passdata, c->uniqueid, ast_agi_state(c)); return pbx_exec(c, app, passdata); /* 0 on success, -1 on failure */ } } else if (q.swo) { /* not found here, but in another switch */ diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 2b7a0dd7f..7f99ff733 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -228,7 +228,7 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch "AppData: %s\r\n" "Uniqueid: %s\r\n" "AGIstate: %s\r\n", - chan->name, chan->context, chan->exten, chan->priority, app, !ast_strlen_zero(appdata) ? appdata : "(NULL)", chan->uniqueid, agi_state(chan)); + chan->name, chan->context, chan->exten, chan->priority, app, !ast_strlen_zero(appdata) ? appdata : "(NULL)", chan->uniqueid, ast_agi_state(chan)); res = pbx_exec(chan, a, appdata); } else |