Changing name of global api call to ast_*

My mistake, pointed out by Russell.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128378 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index bfa9d3b..2fdb5b3 100644 (file)
--- 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 *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,
 
 
 /* every time a write lock is obtained for contexts,

diff --git a/main/manager.c b/main/manager.c
index fa92408..679a889 100644 (file)
--- 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 : "",
                        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++;
                        );
                ast_channel_unlock(c);
                numchans++;

diff --git a/main/pbx.c b/main/pbx.c
index dfd4f5f..d0ae17e 100644 (file)
--- 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 */
 }
 
 /*! \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";
 {
        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",
                                        "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 */
                        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 2b7a0dd..7f99ff7 100644 (file)
--- 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",
                                                          "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
                                
                                res = pbx_exec(chan, a, appdata);
                        } else