[svn-commits] rmudgett: trunk r430452 - in /trunk: apps/ channels/ include/asterisk/ main/ ...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jan 9 12:53:57 CST 2015
Author: rmudgett
Date: Fri Jan 9 12:53:49 2015
New Revision: 430452
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430452
Log:
AMI: Remove no longer used parameter from astman_send_listack().
Follow-up issue to -r430435 from reviewboard review.
ASTERISK-24049
Review: https://reviewboard.asterisk.org/r/4315/
Modified:
trunk/apps/app_agent_pool.c
trunk/apps/app_confbridge.c
trunk/apps/app_meetme.c
trunk/apps/app_queue.c
trunk/apps/app_voicemail.c
trunk/channels/chan_dahdi.c
trunk/channels/chan_iax2.c
trunk/channels/chan_sip.c
trunk/channels/chan_skinny.c
trunk/include/asterisk/manager.h
trunk/main/bridge.c
trunk/main/db.c
trunk/main/manager.c
trunk/main/manager_bridges.c
trunk/main/pbx.c
trunk/res/parking/parking_manager.c
trunk/res/res_fax.c
trunk/res/res_manager_devicestate.c
trunk/res/res_manager_presencestate.c
trunk/res/res_mwi_external_ami.c
trunk/res/res_pjsip/pjsip_configuration.c
trunk/res/res_pjsip_outbound_registration.c
trunk/res/res_pjsip_pubsub.c
trunk/res/res_pjsip_registrar.c
Modified: trunk/apps/app_agent_pool.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_agent_pool.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/apps/app_agent_pool.c (original)
+++ trunk/apps/app_agent_pool.c Fri Jan 9 12:53:49 2015
@@ -2532,7 +2532,7 @@
} else {
id_text[0] = '\0';
}
- astman_send_listack(s, m, "Agents will follow", "start");
+ astman_send_listack(s, m, "Agents will follow");
iter = ao2_iterator_init(agents, 0);
for (; (agent = ao2_iterator_next(&iter)); ao2_ref(agent, -1)) {
Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Fri Jan 9 12:53:49 2015
@@ -2883,7 +2883,7 @@
return 0;
}
- astman_send_listack(s, m, "Confbridge user list will follow", "start");
+ astman_send_listack(s, m, "Confbridge user list will follow");
ao2_lock(conference);
AST_LIST_TRAVERSE(&conference->active_list, user, list) {
@@ -2920,7 +2920,7 @@
return 0;
}
- astman_send_listack(s, m, "Confbridge conferences will follow", "start");
+ astman_send_listack(s, m, "Confbridge conferences will follow");
/* Traverse the conference list */
iter = ao2_iterator_init(conference_bridges, 0);
Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Jan 9 12:53:49 2015
@@ -5530,7 +5530,7 @@
return 0;
}
- astman_send_listack(s, m, "Meetme user list will follow", "start");
+ astman_send_listack(s, m, "Meetme user list will follow");
/* Find the right conference */
AST_LIST_LOCK(&confs);
@@ -5603,7 +5603,7 @@
return 0;
}
- astman_send_listack(s, m, "Meetme conferences will follow", "start");
+ astman_send_listack(s, m, "Meetme conferences will follow");
now = time(NULL);
Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Fri Jan 9 12:53:49 2015
@@ -9472,7 +9472,7 @@
struct ao2_iterator queue_iter;
struct ao2_iterator mem_iter;
- astman_send_listack(s, m, "Queue summary will follow", "start");
+ astman_send_listack(s, m, "Queue summary will follow");
time(&now);
idText[0] = '\0';
if (!ast_strlen_zero(id)) {
@@ -9549,7 +9549,7 @@
struct ao2_iterator queue_iter;
struct ao2_iterator mem_iter;
- astman_send_listack(s, m, "Queue status will follow", "start");
+ astman_send_listack(s, m, "Queue status will follow");
time(&now);
idText[0] = '\0';
if (!ast_strlen_zero(id)) {
Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Jan 9 12:53:49 2015
@@ -13065,7 +13065,7 @@
return RESULT_SUCCESS;
}
- astman_send_listack(s, m, "Voicemail user list will follow", "start");
+ astman_send_listack(s, m, "Voicemail user list will follow");
AST_LIST_TRAVERSE(&users, vmu, list) {
char dirname[256];
Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Fri Jan 9 12:53:49 2015
@@ -16082,7 +16082,7 @@
snprintf(idText, sizeof(idText), "ActionID: %s\r\n", id);
}
- astman_send_listack(s, m, "DAHDI channel status will follow", "start");
+ astman_send_listack(s, m, "DAHDI channel status will follow");
ast_mutex_lock(&iflock);
@@ -16176,7 +16176,7 @@
action_id[0] = '\0';
}
- astman_send_listack(s, m, "Span status will follow", "start");
+ astman_send_listack(s, m, "Span status will follow");
count = 0;
for (idx = 0; idx < ARRAY_LEN(pris); ++idx) {
Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Fri Jan 9 12:53:49 2015
@@ -7252,7 +7252,7 @@
if (!ast_strlen_zero(id))
snprintf(idtext, sizeof(idtext), "ActionID: %s\r\n", id);
- astman_send_listack(s, m, "Peer status list will follow", "start");
+ astman_send_listack(s, m, "Peer status list will follow");
/* List the peers in separate manager events */
__iax2_show_peers(-1, &total, s, 3, a);
@@ -7288,7 +7288,7 @@
snprintf(cont.idtext, sizeof(cont.idtext), "ActionID: %s\r\n", id);
}
- astman_send_listack(s, m, "IAX Peer status list will follow", "start");
+ astman_send_listack(s, m, "IAX Peer status list will follow");
i = ao2_iterator_init(peers, 0);
for (; (peer = ao2_iterator_next(&i)); peer_unref(peer)) {
@@ -7378,7 +7378,7 @@
if (!ast_strlen_zero(id))
snprintf(idtext, sizeof(idtext), "ActionID: %s\r\n", id);
- astman_send_listack(s, m, "Registrations will follow", "start");
+ astman_send_listack(s, m, "Registrations will follow");
AST_LIST_LOCK(®istrations);
AST_LIST_TRAVERSE(®istrations, reg, entry) {
Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Jan 9 12:53:49 2015
@@ -19223,7 +19223,7 @@
if (!ast_strlen_zero(id))
snprintf(idtext, sizeof(idtext), "ActionID: %s\r\n", id);
- astman_send_listack(s, m, "Registrations will follow", "start");
+ astman_send_listack(s, m, "Registrations will follow");
iter = ao2_iterator_init(registry_list, 0);
while ((iterator = ao2_t_iterator_next(&iter, "manager_show_registry iter"))) {
@@ -19275,7 +19275,7 @@
if (!ast_strlen_zero(id))
snprintf(idtext, sizeof(idtext), "ActionID: %s\r\n", id);
- astman_send_listack(s, m, "Peer status list will follow", "start");
+ astman_send_listack(s, m, "Peer status list will follow");
/* List the peers in separate manager events */
_sip_show_peers(-1, &total, s, m, 3, a);
@@ -20067,7 +20067,7 @@
}
}
- astman_send_listack(s, m, "Peer status will follow", "start");
+ astman_send_listack(s, m, "Peer status will follow");
if (!peer) {
struct ao2_iterator i = ao2_iterator_init(peers, 0);
Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Fri Jan 9 12:53:49 2015
@@ -4138,7 +4138,7 @@
const char *a[] = {"skinny", "show", "devices"};
int total = 0;
- astman_send_listack(s, m, "Device status list will follow", "start");
+ astman_send_listack(s, m, "Device status list will follow");
/* List the devices in separate manager events */
_skinny_show_devices(-1, &total, s, m, 3, a);
@@ -4380,7 +4380,7 @@
const char *a[] = {"skinny", "show", "lines"};
int total = 0;
- astman_send_listack(s, m, "Line status list will follow", "start");
+ astman_send_listack(s, m, "Line status list will follow");
/* List the lines in separate manager events */
_skinny_show_lines(-1, &total, s, m, 3, a);
Modified: trunk/include/asterisk/manager.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/manager.h?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/include/asterisk/manager.h (original)
+++ trunk/include/asterisk/manager.h Fri Jan 9 12:53:49 2015
@@ -305,14 +305,13 @@
* \param s - AMI session control struct.
* \param m - AMI action request that started the list.
* \param msg - Message contents describing the list to follow.
- * \param listflag - Not used. Historically always set to "start".
*
* \note You need to call astman_send_list_complete_start() and
* astman_send_list_complete_end() to send the AMI list completion event.
*
* \return Nothing
*/
-void astman_send_listack(struct mansession *s, const struct message *m, char *msg, char *listflag);
+void astman_send_listack(struct mansession *s, const struct message *m, char *msg);
/*!
* \brief Start the list complete event.
Modified: trunk/main/bridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/main/bridge.c (original)
+++ trunk/main/bridge.c Fri Jan 9 12:53:49 2015
@@ -5209,7 +5209,7 @@
ast_str_set(&id_text, 0, "ActionID: %s\r\n", id);
}
- astman_send_listack(s, m, "Bridge technology listing will follow", "start");
+ astman_send_listack(s, m, "Bridge technology listing will follow");
AST_RWLIST_RDLOCK(&bridge_technologies);
AST_RWLIST_TRAVERSE(&bridge_technologies, cur, entry) {
Modified: trunk/main/db.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/db.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/main/db.c (original)
+++ trunk/main/db.c Fri Jan 9 12:53:49 2015
@@ -864,7 +864,7 @@
if (res) {
astman_send_error(s, m, "Database entry not found");
} else {
- astman_send_listack(s, m, "Result will follow", "start");
+ astman_send_listack(s, m, "Result will follow");
astman_append(s, "Event: DBGetResponse\r\n"
"Family: %s\r\n"
Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Fri Jan 9 12:53:49 2015
@@ -2919,7 +2919,7 @@
astman_send_response_full(s, m, "Success", MSG_MOREDATA, NULL);
}
-void astman_send_listack(struct mansession *s, const struct message *m, char *msg, char *listflag)
+void astman_send_listack(struct mansession *s, const struct message *m, char *msg)
{
astman_send_response_full(s, m, "Success", msg, "Start");
}
@@ -4203,7 +4203,7 @@
return 0;
}
- astman_send_listack(s, m, "Channels hung up will follow", "start");
+ astman_send_listack(s, m, "Channels hung up will follow");
iter = ast_channel_iterator_all_new();
if (iter) {
@@ -4481,7 +4481,7 @@
}
}
- astman_send_listack(s, m, "Channel status will follow", "start");
+ astman_send_listack(s, m, "Channel status will follow");
if (!ast_strlen_zero(id)) {
snprintf(id_text, sizeof(id_text), "ActionID: %s\r\n", id);
@@ -5908,7 +5908,7 @@
return 0;
}
- astman_send_listack(s, m, "Channels will follow", "start");
+ astman_send_listack(s, m, "Channels will follow");
it_chans = ao2_iterator_init(channels, 0);
for (; (msg = ao2_iterator_next(&it_chans)); ao2_ref(msg, -1)) {
Modified: trunk/main/manager_bridges.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager_bridges.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/main/manager_bridges.c (original)
+++ trunk/main/manager_bridges.c Fri Jan 9 12:53:49 2015
@@ -414,7 +414,7 @@
return -1;
}
- astman_send_listack(s, m, "Bridge listing will follow", "start");
+ astman_send_listack(s, m, "Bridge listing will follow");
if (!ast_strlen_zero(type_filter)) {
char *type_filter_dup = ast_strdupa(type_filter);
@@ -506,7 +506,7 @@
return -1;
}
- astman_send_listack(s, m, "Bridge channel listing will follow", "start");
+ astman_send_listack(s, m, "Bridge channel listing will follow");
list_data.id_text = ast_str_buffer(id_text);
list_data.count = 0;
Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Fri Jan 9 12:53:49 2015
@@ -8147,7 +8147,7 @@
/*! \brief Send ack once */
static void manager_dpsendack(struct mansession *s, const struct message *m)
{
- astman_send_listack(s, m, "DialPlan list will follow", "start");
+ astman_send_listack(s, m, "DialPlan list will follow");
}
/*! \brief Show dialplan extensions
@@ -12010,7 +12010,7 @@
return 0;
}
- astman_send_listack(s, m, "Extension Statuses will follow", "start");
+ astman_send_listack(s, m, "Extension Statuses will follow");
ao2_lock(hints);
it_hints = ao2_iterator_init(hints, 0);
Modified: trunk/res/parking/parking_manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/parking/parking_manager.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/parking/parking_manager.c (original)
+++ trunk/res/parking/parking_manager.c Fri Jan 9 12:53:49 2015
@@ -255,7 +255,7 @@
return;
}
- astman_send_listack(s, m, "Parked calls will follow", "start");
+ astman_send_listack(s, m, "Parked calls will follow");
iter_users = ao2_iterator_init(curlot->parked_users, 0);
while ((curuser = ao2_iterator_next(&iter_users))) {
@@ -308,7 +308,7 @@
return;
}
- astman_send_listack(s, m, "Parked calls will follow", "start");
+ astman_send_listack(s, m, "Parked calls will follow");
iter_lots = ao2_iterator_init(lot_container, 0);
while ((curlot = ao2_iterator_next(&iter_lots))) {
@@ -422,7 +422,7 @@
return 0;
}
- astman_send_listack(s, m, "Parking lots will follow", "start");
+ astman_send_listack(s, m, "Parking lots will follow");
list_data.id_text = id_text;
list_data.count = 0;
Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Fri Jan 9 12:53:49 2015
@@ -4200,7 +4200,7 @@
snprintf(id_text, sizeof(id_text), "ActionID: %s\r\n", action_id);
}
- astman_send_listack(s, m, "FAXSessionsEntry event list will follow", "Start");
+ astman_send_listack(s, m, "FAXSessionsEntry event list will follow");
iter = ao2_iterator_init(faxregistry.container, 0);
while ((session = ao2_iterator_next(&iter))) {
Modified: trunk/res/res_manager_devicestate.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_manager_devicestate.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/res_manager_devicestate.c (original)
+++ trunk/res/res_manager_devicestate.c Fri Jan 9 12:53:49 2015
@@ -85,7 +85,7 @@
return 0;
}
- astman_send_listack(s, m, "Device State Changes will follow", "start");
+ astman_send_listack(s, m, "Device State Changes will follow");
it_states = ao2_iterator_init(device_states, 0);
for (; (msg = ao2_iterator_next(&it_states)); ao2_ref(msg, -1)) {
Modified: trunk/res/res_manager_presencestate.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_manager_presencestate.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/res_manager_presencestate.c (original)
+++ trunk/res/res_manager_presencestate.c Fri Jan 9 12:53:49 2015
@@ -85,7 +85,7 @@
return 0;
}
- astman_send_listack(s, m, "Presence State Changes will follow", "start");
+ astman_send_listack(s, m, "Presence State Changes will follow");
it_states = ao2_iterator_init(presence_states, 0);
for (; (msg = ao2_iterator_next(&it_states)); ao2_ref(msg, -1)) {
Modified: trunk/res/res_mwi_external_ami.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_mwi_external_ami.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/res_mwi_external_ami.c (original)
+++ trunk/res/res_mwi_external_ami.c Fri Jan 9 12:53:49 2015
@@ -197,7 +197,7 @@
return 0;
}
- astman_send_listack(s, m, "Mailboxes will follow", "start");
+ astman_send_listack(s, m, "Mailboxes will follow");
id = astman_get_header(m, "ActionID");
if (!ast_strlen_zero(id)) {
Modified: trunk/res/res_pjsip/pjsip_configuration.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/pjsip_configuration.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/res_pjsip/pjsip_configuration.c (original)
+++ trunk/res/res_pjsip/pjsip_configuration.c Fri Jan 9 12:53:49 2015
@@ -1162,8 +1162,7 @@
return -1;
}
- astman_send_listack(s, m, "Following are Events for each object "
- "associated with the the Endpoint", "start");
+ astman_send_listack(s, m, "Following are Events for each object associated with the the Endpoint");
/* the endpoint detail needs to always come first so apply as such */
if (format_ami_endpoint(endpoint, &ami) ||
@@ -1246,8 +1245,7 @@
return 0;
}
- astman_send_listack(s, m, "A listing of Endpoints follows, "
- "presented as EndpointList events", "start");
+ astman_send_listack(s, m, "A listing of Endpoints follows, presented as EndpointList events");
ao2_callback(endpoints, OBJ_NODATA, format_ami_endpoints, &ami);
Modified: trunk/res/res_pjsip_outbound_registration.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_outbound_registration.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/res_pjsip_outbound_registration.c (original)
+++ trunk/res/res_pjsip_outbound_registration.c Fri Jan 9 12:53:49 2015
@@ -1420,8 +1420,7 @@
return -1;
}
- astman_send_listack(s, m, "Following are Events for each Outbound registration",
- "start");
+ astman_send_listack(s, m, "Following are Events for each Outbound registration");
ao2_callback(regs, OBJ_NODATA, ami_outbound_registration_detail, &ami_outbound);
Modified: trunk/res/res_pjsip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_pubsub.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/res_pjsip_pubsub.c (original)
+++ trunk/res/res_pjsip_pubsub.c Fri Jan 9 12:53:49 2015
@@ -3262,8 +3262,7 @@
struct ast_sip_ami ami = { .s = s, .m = m, .action_id = astman_get_header(m, "ActionID"), };
int num;
- astman_send_listack(s, m, "Following are Events for "
- "each inbound Subscription", "start");
+ astman_send_listack(s, m, "Following are Events for each inbound Subscription");
num = for_each_subscription(ami_subscription_detail_inbound, &ami);
@@ -3277,8 +3276,7 @@
struct ast_sip_ami ami = { .s = s, .m = m, .action_id = astman_get_header(m, "ActionID"), };
int num;
- astman_send_listack(s, m, "Following are Events for "
- "each outbound Subscription", "start");
+ astman_send_listack(s, m, "Following are Events for each outbound Subscription");
num = for_each_subscription(ami_subscription_detail_outbound, &ami);
@@ -3322,8 +3320,7 @@
return 0;
}
- astman_send_listack(s, m, "A listing of resource lists follows, "
- "presented as ResourceListDetail events", "start");
+ astman_send_listack(s, m, "A listing of resource lists follows, presented as ResourceListDetail events");
ao2_callback(lists, OBJ_NODATA, format_ami_resource_lists, &ami);
Modified: trunk/res/res_pjsip_registrar.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_registrar.c?view=diff&rev=430452&r1=430451&r2=430452
==============================================================================
--- trunk/res/res_pjsip_registrar.c (original)
+++ trunk/res/res_pjsip_registrar.c Fri Jan 9 12:53:49 2015
@@ -767,8 +767,7 @@
int count = 0;
struct ast_sip_ami ami = { .s = s, .m = m, .arg = &count, .action_id = astman_get_header(m, "ActionID"), };
- astman_send_listack(s, m, "Following are Events for each Inbound "
- "registration", "start");
+ astman_send_listack(s, m, "Following are Events for each Inbound registration");
ami_registrations_endpoints(&ami);
More information about the svn-commits
mailing list