[svn-commits] mmichelson: branch group/issue8824 r183986 - in /team/group/issue8824: apps/ ...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Mar 24 12:21:12 CDT 2009
Author: mmichelson
Date: Tue Mar 24 12:21:08 2009
New Revision: 183986
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=183986
Log:
Fix an inconsistency in function naming that Richard spotted.
Modified:
team/group/issue8824/apps/app_dial.c
team/group/issue8824/apps/app_directed_pickup.c
team/group/issue8824/apps/app_queue.c
team/group/issue8824/channels/chan_sip.c
team/group/issue8824/funcs/func_connectedline.c
team/group/issue8824/include/asterisk/channel.h
team/group/issue8824/main/channel.c
team/group/issue8824/main/features.c
Modified: team/group/issue8824/apps/app_dial.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/apps/app_dial.c?view=diff&rev=183986&r1=183985&r2=183986
==============================================================================
--- team/group/issue8824/apps/app_dial.c (original)
+++ team/group/issue8824/apps/app_dial.c Tue Mar 24 12:21:08 2009
@@ -841,7 +841,7 @@
ast_connected_line_copy_from_caller(&connected_caller, &outgoing->chan->cid);
ast_channel_unlock(outgoing->chan);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
- ast_channel_connected_line_update(in, &connected_caller);
+ ast_channel_update_connected_line(in, &connected_caller);
ast_party_connected_line_free(&connected_caller);
}
}
@@ -892,13 +892,13 @@
ast_verb(3, "%s answered %s\n", c->name, in->name);
if (!single && !ast_test_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE)) {
if (o->connected.id.number) {
- ast_channel_connected_line_update(in, &o->connected);
+ ast_channel_update_connected_line(in, &o->connected);
} else if (!ast_test_flag64(o, DIAL_NOCONNECTEDLINE)) {
ast_channel_lock(c);
ast_connected_line_copy_from_caller(&connected_caller, &c->cid);
ast_channel_unlock(c);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
- ast_channel_connected_line_update(in, &connected_caller);
+ ast_channel_update_connected_line(in, &connected_caller);
ast_party_connected_line_free(&connected_caller);
}
}
@@ -942,13 +942,13 @@
ast_verb(3, "%s answered %s\n", c->name, in->name);
if (!single && !ast_test_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE)) {
if (o->connected.id.number) {
- ast_channel_connected_line_update(in, &o->connected);
+ ast_channel_update_connected_line(in, &o->connected);
} else if (!ast_test_flag64(o, DIAL_NOCONNECTEDLINE)) {
ast_channel_lock(c);
ast_connected_line_copy_from_caller(&connected_caller, &c->cid);
ast_channel_unlock(c);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
- ast_channel_connected_line_update(in, &connected_caller);
+ ast_channel_update_connected_line(in, &connected_caller);
ast_party_connected_line_free(&connected_caller);
}
}
Modified: team/group/issue8824/apps/app_directed_pickup.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/apps/app_directed_pickup.c?view=diff&rev=183986&r1=183985&r2=183986
==============================================================================
--- team/group/issue8824/apps/app_directed_pickup.c (original)
+++ team/group/issue8824/apps/app_directed_pickup.c Tue Mar 24 12:21:08 2009
@@ -98,7 +98,7 @@
connected_caller = target->connected;
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
- ast_channel_connected_line_update(chan, &connected_caller);
+ ast_channel_update_connected_line(chan, &connected_caller);
ast_party_connected_line_collect_caller(&connected_caller, &chan->cid);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
Modified: team/group/issue8824/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/apps/app_queue.c?view=diff&rev=183986&r1=183985&r2=183986
==============================================================================
--- team/group/issue8824/apps/app_queue.c (original)
+++ team/group/issue8824/apps/app_queue.c Tue Mar 24 12:21:08 2009
@@ -2833,13 +2833,13 @@
ast_verb(3, "%s answered %s\n", o->chan->name, in->name);
if (update_connectedline) {
if (o->connected.id.number) {
- ast_channel_connected_line_update(in, &o->connected);
+ ast_channel_update_connected_line(in, &o->connected);
} else if (o->update_connectedline) {
ast_channel_lock(o->chan);
ast_connected_line_copy_from_caller(&connected_caller, &o->chan->cid);
ast_channel_unlock(o->chan);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
- ast_channel_connected_line_update(in, &connected_caller);
+ ast_channel_update_connected_line(in, &connected_caller);
ast_party_connected_line_free(&connected_caller);
}
}
@@ -2933,13 +2933,13 @@
ast_verb(3, "%s answered %s\n", o->chan->name, in->name);
if (update_connectedline) {
if (o->connected.id.number) {
- ast_channel_connected_line_update(in, &o->connected);
+ ast_channel_update_connected_line(in, &o->connected);
} else if (o->update_connectedline) {
ast_channel_lock(o->chan);
ast_connected_line_copy_from_caller(&connected_caller, &o->chan->cid);
ast_channel_unlock(o->chan);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
- ast_channel_connected_line_update(in, &connected_caller);
+ ast_channel_update_connected_line(in, &connected_caller);
ast_party_connected_line_free(&connected_caller);
}
}
Modified: team/group/issue8824/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/channels/chan_sip.c?view=diff&rev=183986&r1=183985&r2=183986
==============================================================================
--- team/group/issue8824/channels/chan_sip.c (original)
+++ team/group/issue8824/channels/chan_sip.c Tue Mar 24 12:21:08 2009
@@ -19912,12 +19912,12 @@
ast_connected_line_copy_from_caller(&connected_caller, ¤t->chan2->cid);
ast_channel_unlock(current->chan2);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
- ast_channel_connected_line_update(target.chan2, &connected_caller);
+ ast_channel_update_connected_line(target.chan2, &connected_caller);
ast_channel_lock(target.chan2);
ast_connected_line_copy_from_caller(&connected_caller, &target.chan2->cid);
ast_channel_unlock(target.chan2);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
- ast_channel_connected_line_update(current->chan2, &connected_caller);
+ ast_channel_update_connected_line(current->chan2, &connected_caller);
ast_party_connected_line_free(&connected_caller);
} else {
/* Notify the first other party that they are connected to someone else assuming that target.chan1
@@ -19928,7 +19928,7 @@
ast_channel_unlock(target.chan1);
connected_caller = target.chan1->connected;
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
- ast_channel_connected_line_update(current->chan2, &connected_caller);
+ ast_channel_update_connected_line(current->chan2, &connected_caller);
ast_party_connected_line_free(&connected_caller);
}
Modified: team/group/issue8824/funcs/func_connectedline.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/funcs/func_connectedline.c?view=diff&rev=183986&r1=183985&r2=183986
==============================================================================
--- team/group/issue8824/funcs/func_connectedline.c (original)
+++ team/group/issue8824/funcs/func_connectedline.c Tue Mar 24 12:21:08 2009
@@ -140,7 +140,7 @@
}
}
else {
- set_it = ast_channel_connected_line_update;
+ set_it = ast_channel_update_connected_line;
}
ast_channel_lock(chan);
Modified: team/group/issue8824/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/include/asterisk/channel.h?view=diff&rev=183986&r1=183985&r2=183986
==============================================================================
--- team/group/issue8824/include/asterisk/channel.h (original)
+++ team/group/issue8824/include/asterisk/channel.h Tue Mar 24 12:21:08 2009
@@ -2210,7 +2210,7 @@
*
* \return Nothing
*/
-void ast_channel_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected);
+void ast_channel_update_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected);
/*!
* \brief Queue a connected line update frame on a channel
Modified: team/group/issue8824/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/main/channel.c?view=diff&rev=183986&r1=183985&r2=183986
==============================================================================
--- team/group/issue8824/main/channel.c (original)
+++ team/group/issue8824/main/channel.c Tue Mar 24 12:21:08 2009
@@ -6129,7 +6129,7 @@
return 0;
}
-void ast_channel_connected_line_update(struct ast_channel *chan, const struct ast_party_connected_line *connected)
+void ast_channel_update_connected_line(struct ast_channel *chan, const struct ast_party_connected_line *connected)
{
unsigned char data[1024]; /* This should be large enough */
size_t datalen;
Modified: team/group/issue8824/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/issue8824/main/features.c?view=diff&rev=183986&r1=183985&r2=183986
==============================================================================
--- team/group/issue8824/main/features.c (original)
+++ team/group/issue8824/main/features.c Tue Mar 24 12:21:08 2009
@@ -1578,12 +1578,12 @@
* we use the transferer's connected line information here.
*/
connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
- ast_channel_connected_line_update(xferchan, &connected_line);
+ ast_channel_update_connected_line(xferchan, &connected_line);
ast_channel_lock(xferchan);
ast_connected_line_copy_from_caller(&connected_line, &xferchan->cid);
ast_channel_unlock(xferchan);
connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
- ast_channel_connected_line_update(newchan, &connected_line);
+ ast_channel_update_connected_line(newchan, &connected_line);
ast_party_connected_line_free(&connected_line);
if (ast_stream_and_wait(newchan, xfersound, ""))
@@ -1691,12 +1691,12 @@
ast_connected_line_copy_from_caller(&connected_line, &newchan->cid);
ast_channel_unlock(newchan);
connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
- ast_channel_connected_line_update(xferchan, &connected_line);
+ ast_channel_update_connected_line(xferchan, &connected_line);
ast_channel_lock(xferchan);
ast_connected_line_copy_from_caller(&connected_line, &xferchan->cid);
ast_channel_unlock(xferchan);
connected_line.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
- ast_channel_connected_line_update(newchan, &connected_line);
+ ast_channel_update_connected_line(newchan, &connected_line);
ast_party_connected_line_free(&connected_line);
@@ -4499,7 +4499,7 @@
connected_caller = cur->connected;
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
- ast_channel_connected_line_update(chan, &connected_caller);
+ ast_channel_update_connected_line(chan, &connected_caller);
ast_party_connected_line_collect_caller(&connected_caller, &chan->cid);
connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
More information about the svn-commits
mailing list