[svn-commits] oej: trunk r128378 - in /trunk: include/asterisk/ main/ pbx/

[SVN commits to the Digium repositories]

Author: oej
Date: Sun Jul  6 03:28:58 2008
New Revision: 128378

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128378
Log:
Changing name of global api call to ast_* 
My mistake, pointed out by Russell.

Modified:
    trunk/include/asterisk/pbx.h
    trunk/main/manager.c
    trunk/main/pbx.c
    trunk/pbx/pbx_realtime.c

Modified: trunk/include/asterisk/pbx.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/pbx.h?view=diff&rev=128378&r1=128377&r2=128378
==============================================================================
--- trunk/include/asterisk/pbx.h (original)
+++ trunk/include/asterisk/pbx.h Sun Jul  6 03:28:58 2008
@@ -999,7 +999,7 @@
 									 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,

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=128378&r1=128377&r2=128378
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Sun Jul  6 03:28:58 2008
@@ -2723,7 +2723,7 @@
 			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++;

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=128378&r1=128377&r2=128378
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Sun Jul  6 03:28:58 2008
@@ -2902,7 +2902,7 @@
 }
 
 /*! \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 @@
 					"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 */

Modified: trunk/pbx/pbx_realtime.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_realtime.c?view=diff&rev=128378&r1=128377&r2=128378
==============================================================================
--- trunk/pbx/pbx_realtime.c (original)
+++ trunk/pbx/pbx_realtime.c Sun Jul  6 03:28:58 2008
@@ -228,7 +228,7 @@
 							  "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