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/


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

24 files changed, 43 insertions, 51 deletions

diff --git a/apps/app_agent_pool.c b/apps/app_agent_pool.c
index a36c77143..0e8a1b199 100644
--- a/apps/app_agent_pool.c
+++ b/apps/app_agent_pool.c
@@ -2532,7 +2532,7 @@ static int action_agents(struct mansession *s, const struct message *m)
 	} 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)) {
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index b5d48452d..53bd0e8fa 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -2883,7 +2883,7 @@ static int action_confbridgelist(struct mansession *s, const struct message *m)
 		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 @@ static int action_confbridgelistrooms(struct mansession *s, const struct message
 		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);
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 907770e22..c449ba0f8 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -5530,7 +5530,7 @@ static int action_meetmelist(struct mansession *s, const struct message *m)
 		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 @@ static int action_meetmelistrooms(struct mansession *s, const struct message *m)
 		return 0;
 	}
 
-	astman_send_listack(s, m, "Meetme conferences will follow", "start");
+	astman_send_listack(s, m, "Meetme conferences will follow");
 
 	now = time(NULL);
 
diff --git a/apps/app_queue.c b/apps/app_queue.c
index d41641c62..e3d86992d 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -9472,7 +9472,7 @@ static int manager_queues_summary(struct mansession *s, const struct message *m)
 	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 @@ static int manager_queues_status(struct mansession *s, const struct message *m)
 	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)) {
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 6311263a4..92b6ddd2f 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -13065,7 +13065,7 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa
 		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];
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 10b6295cd..7537074d8 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -16082,7 +16082,7 @@ static int action_dahdishowchannels(struct mansession *s, const struct message *
 		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 @@ static int action_prishowspans(struct mansession *s, const struct message *m)
 		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) {
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index bb65df460..a6b4f0aa6 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -7252,7 +7252,7 @@ static int manager_iax2_show_peers(struct mansession *s, const struct message *m
 	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 @@ static int manager_iax2_show_peer_list(struct mansession *s, const struct messag
 		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 @@ static int manager_iax2_show_registry(struct mansession *s, const struct message
 	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(&registrations);
 	AST_LIST_TRAVERSE(&registrations, reg, entry) {
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 1a0ff94b7..a8d4eac15 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19223,7 +19223,7 @@ static int manager_show_registry(struct mansession *s, const struct message *m)
 	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 @@ static int manager_sip_show_peers(struct mansession *s, const struct message *m)
 	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 @@ static int manager_sip_peer_status(struct mansession *s, const struct message *m
 		}
 	}
 
-	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);
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index aabac57a3..3d68ac66f 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -4138,7 +4138,7 @@ static int manager_skinny_show_devices(struct mansession *s, const struct messag
 	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 @@ static int manager_skinny_show_lines(struct mansession *s, const struct message
 	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);
diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h
index 31f31b7f0..908d4972c 100644
--- a/include/asterisk/manager.h
+++ b/include/asterisk/manager.h
@@ -305,14 +305,13 @@ void astman_send_ack(struct mansession *s, const struct message *m, char *msg);
  * \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.
diff --git a/main/bridge.c b/main/bridge.c
index 6b4778f5d..e1f2d1eeb 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -5209,7 +5209,7 @@ static int manager_bridge_tech_list(struct mansession *s, const struct message *
 		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) {
diff --git a/main/db.c b/main/db.c
index 4bb9355c6..28e548814 100644
--- a/main/db.c
+++ b/main/db.c
@@ -864,7 +864,7 @@ static int manager_dbget(struct mansession *s, const struct message *m)
 	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"
diff --git a/main/manager.c b/main/manager.c
index 4410cd7c5..137e50a3a 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2919,7 +2919,7 @@ static void astman_start_ack(struct mansession *s, const struct message *m)
 	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 @@ static int action_hangup(struct mansession *s, const struct message *m)
 		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 @@ static int action_status(struct mansession *s, const struct message *m)
 		}
 	}
 
-	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 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
 		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)) {
diff --git a/main/manager_bridges.c b/main/manager_bridges.c
index 10a5046d9..8ed4d8969 100644
--- a/main/manager_bridges.c
+++ b/main/manager_bridges.c
@@ -414,7 +414,7 @@ static int manager_bridges_list(struct mansession *s, const struct message *m)
 		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 @@ static int manager_bridge_info(struct mansession *s, const struct message *m)
 		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;
diff --git a/main/pbx.c b/main/pbx.c
index b2c365a9b..7f914d4f1 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8147,7 +8147,7 @@ static char *handle_debug_dialplan(struct ast_cli_entry *e, int cmd, struct ast_
 /*! \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 @@ static int action_extensionstatelist(struct mansession *s, const struct message
 		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);
diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c
index 74b455928..0e8f50dea 100644
--- a/res/parking/parking_manager.c
+++ b/res/parking/parking_manager.c
@@ -255,7 +255,7 @@ static void manager_parking_status_single_lot(struct mansession *s, const struct
 		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 @@ static void manager_parking_status_all_lots(struct mansession *s, const struct m
 		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 @@ static int manager_parking_lot_list(struct mansession *s, const struct message *
 		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;
diff --git a/res/res_fax.c b/res/res_fax.c
index 5f2798ab4..d20bce615 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -4200,7 +4200,7 @@ static int manager_fax_sessions(struct mansession *s, const struct message *m)
 		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))) {
diff --git a/res/res_manager_devicestate.c b/res/res_manager_devicestate.c
index 3d1f1ab10..bc2e4f23d 100644
--- a/res/res_manager_devicestate.c
+++ b/res/res_manager_devicestate.c
@@ -85,7 +85,7 @@ static int action_devicestatelist(struct mansession *s, const struct message *m)
 		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)) {
diff --git a/res/res_manager_presencestate.c b/res/res_manager_presencestate.c
index bb9e63ab9..1b5c540a3 100644
--- a/res/res_manager_presencestate.c
+++ b/res/res_manager_presencestate.c
@@ -85,7 +85,7 @@ static int action_presencestatelist(struct mansession *s, const struct message *
 		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)) {
diff --git a/res/res_mwi_external_ami.c b/res/res_mwi_external_ami.c
index 87ce411e6..2efefa60e 100644
--- a/res/res_mwi_external_ami.c
+++ b/res/res_mwi_external_ami.c
@@ -197,7 +197,7 @@ static int mwi_mailbox_get(struct mansession *s, const struct message *m)
 		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)) {
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index 4dcc7afb1..fb554fd89 100644
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -1162,8 +1162,7 @@ static int ami_show_endpoint(struct mansession *s, const struct message *m)
 		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 @@ static int ami_show_endpoints(struct mansession *s, const struct message *m)
 		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);
 
diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c
index 3a01a9426..fe9f0b588 100644
--- a/res/res_pjsip_outbound_registration.c
+++ b/res/res_pjsip_outbound_registration.c
@@ -1420,8 +1420,7 @@ static int ami_show_outbound_registrations(struct mansession *s,
 		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);
 
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index f143fa015..1b2f39dd1 100644
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -3262,8 +3262,7 @@ static int ami_show_subscriptions_inbound(struct mansession *s, const struct mes
 	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 @@ static int ami_show_subscriptions_outbound(struct mansession *s, const struct me
 	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 @@ static int ami_show_resource_lists(struct mansession *s, const struct message *m
 		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);
 
diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c
index 2e298bd69..f0d1f500d 100644
--- a/res/res_pjsip_registrar.c
+++ b/res/res_pjsip_registrar.c
@@ -767,8 +767,7 @@ static int ami_show_registrations(struct mansession *s, const struct message *m)
 	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);