diff options
| author | Terry Wilson <twilson@digium.com> | 2012-02-20 23:43:27 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-02-20 23:43:27 +0000 |
| commit | 57f42bd74f78d5022631b2ba2269892f8a3a384a (patch) | |
| tree | 3283ec4ac88c5b3c267f4490b410e5331911f2bb /pbx | |
| parent | 25e5eb3b96e6d9bcbb2fc02fbd879ae21104c1f5 (diff) | |
ast_channel opaquification of pointers and integral types
Review: https://reviewboard.asterisk.org/r/1753/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_lua.c | 6 | ||||
| -rw-r--r-- | pbx/pbx_realtime.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index 276e4f51d..725fde923 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -214,7 +214,7 @@ static int lua_pbx_exec(lua_State *L) context = ast_strdupa(ast_channel_context(chan)); exten = ast_strdupa(ast_channel_exten(chan)); - priority = chan->priority; + priority = ast_channel_priority(chan); lua_concat_args(L, 2, nargs); data = lua_tostring(L, -1); @@ -254,9 +254,9 @@ static int lua_pbx_exec(lua_State *L) lua_pushstring(L, exten); lua_pushstring(L, ast_channel_exten(chan)); lua_pushliteral(L, "exten"); - } else if (priority != chan->priority) { + } else if (priority != ast_channel_priority(chan)) { lua_pushinteger(L, priority); - lua_pushinteger(L, chan->priority); + lua_pushinteger(L, ast_channel_priority(chan)); lua_pushliteral(L, "priority"); } else { /* no goto - restore the original position back diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 0ec850cd4..cc8bfc503 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -352,7 +352,7 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch if(!ast_strlen_zero(tmp)) pbx_substitute_variables_helper(chan, tmp, appdata, sizeof(appdata) - 1); ast_verb(3, "Executing [%s@%s:%d] %s(\"%s\", \"%s\")\n", - ast_channel_exten(chan), ast_channel_context(chan), chan->priority, + ast_channel_exten(chan), ast_channel_context(chan), ast_channel_priority(chan), term_color(tmp1, app, COLOR_BRCYAN, 0, sizeof(tmp1)), term_color(tmp2, ast_channel_name(chan), COLOR_BRMAGENTA, 0, sizeof(tmp2)), term_color(tmp3, S_OR(appdata, ""), COLOR_BRMAGENTA, 0, sizeof(tmp3))); @@ -364,7 +364,7 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch "Application: %s\r\n" "AppData: %s\r\n" "Uniqueid: %s\r\n", - ast_channel_name(chan), ast_channel_context(chan), ast_channel_exten(chan), chan->priority, app, !ast_strlen_zero(appdata) ? appdata : "(NULL)", ast_channel_uniqueid(chan)); + ast_channel_name(chan), ast_channel_context(chan), ast_channel_exten(chan), ast_channel_priority(chan), app, !ast_strlen_zero(appdata) ? appdata : "(NULL)", ast_channel_uniqueid(chan)); res = pbx_exec(chan, a, appdata); } else |