From: Naveen Albert Date: Thu, 7 Aug 2025 18:55:24 +0000 (-0400) Subject: app_queue: Remove redundant/deprecated function. X-Git-Tag: 23.0.0-pre1~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aca74d100c296b8c59c9cd743db78101c87cbcc0;p=thirdparty%2Fasterisk.git app_queue: Remove redundant/deprecated function. QUEUE_MEMBER_COUNT has been deprecated since at least 1.6, for fully duplicating functionality available in the QUEUE_MEMBER function; remove it now. Resolves: #1341 UpgradeNote: The deprecated QUEUE_MEMBER_COUNT function has been removed; use QUEUE_MEMBER(,logged) instead. --- diff --git a/apps/app_queue.c b/apps/app_queue.c index 1a2c6b37d4..398eab2564 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -310,7 +310,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -366,7 +365,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -409,7 +407,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -459,7 +456,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -506,7 +502,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -543,7 +538,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -624,7 +618,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -692,38 +685,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT - QUEUE_EXISTS - QUEUE_GET_CHANNEL - QUEUE_WAITING_COUNT - QUEUE_MEMBER_LIST - QUEUE_MEMBER_PENALTY - - - - - 1.4.0 - - - Count number of members answering a queue. - - - - - - Returns the number of members currently associated with the specified queuename. - This function has been deprecated in favor of the QUEUE_MEMBER() function - - - Queue - QueueLog - AddQueueMember - RemoveQueueMember - PauseQueueMember - UnpauseQueueMember - QUEUE_VARIABLES - QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -753,7 +714,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -785,7 +745,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_WAITING_COUNT QUEUE_MEMBER_LIST @@ -814,7 +773,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -844,7 +802,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -876,7 +833,6 @@ UnpauseQueueMember QUEUE_VARIABLES QUEUE_MEMBER - QUEUE_MEMBER_COUNT QUEUE_EXISTS QUEUE_GET_CHANNEL QUEUE_WAITING_COUNT @@ -9400,51 +9356,6 @@ static int queue_function_mem_write(struct ast_channel *chan, const char *cmd, c return 0; } -/*! - * \brief Get the total number of members in a specific queue (Deprecated) - * \retval number of members - * \retval -1 on error -*/ -static int queue_function_qac_dep(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) -{ - int count = 0; - struct member *m; - struct call_queue *q; - struct ao2_iterator mem_iter; - static int depflag = 1; - - if (depflag) { - depflag = 0; - ast_log(LOG_NOTICE, "The function QUEUE_MEMBER_COUNT has been deprecated in favor of the QUEUE_MEMBER function and will not be in further releases.\n"); - } - - if (ast_strlen_zero(data)) { - ast_log(LOG_ERROR, "%s requires an argument: queuename\n", cmd); - return -1; - } - - if ((q = find_load_queue_rt_friendly(data))) { - ao2_lock(q); - mem_iter = ao2_iterator_init(q->members, 0); - while ((m = ao2_iterator_next(&mem_iter))) { - /* Count the agents who are logged in and presently answering calls */ - if ((m->status != AST_DEVICE_UNAVAILABLE) && (m->status != AST_DEVICE_INVALID)) { - count++; - } - ao2_ref(m, -1); - } - ao2_iterator_destroy(&mem_iter); - ao2_unlock(q); - queue_t_unref(q, "Done with temporary reference in QUEUE_MEMBER_COUNT"); - } else { - ast_log(LOG_WARNING, "queue %s was not found\n", data); - } - - snprintf(buf, len, "%d", count); - - return 0; -} - /*! \brief Dialplan function QUEUE_GET_CHANNEL() Get caller channel waiting at specified position in the queue */ static int queue_function_queuegetchannel(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len) { @@ -9694,11 +9605,6 @@ static struct ast_custom_function queuemembercount_function = { .write = queue_function_mem_write, }; -static struct ast_custom_function queuemembercount_dep = { - .name = "QUEUE_MEMBER_COUNT", - .read = queue_function_qac_dep, -}; - static struct ast_custom_function queuegetchannel_function = { .name = "QUEUE_GET_CHANNEL", .read = queue_function_queuegetchannel, @@ -11996,7 +11902,6 @@ static int unload_module(void) ast_custom_function_unregister(&queueexists_function); ast_custom_function_unregister(&queuevar_function); ast_custom_function_unregister(&queuemembercount_function); - ast_custom_function_unregister(&queuemembercount_dep); ast_custom_function_unregister(&queuememberlist_function); ast_custom_function_unregister(&queuegetchannel_function); ast_custom_function_unregister(&queuewaitingcount_function); @@ -12109,7 +12014,6 @@ static int load_module(void) err |= ast_custom_function_register(&queuevar_function); err |= ast_custom_function_register(&queueexists_function); err |= ast_custom_function_register(&queuemembercount_function); - err |= ast_custom_function_register(&queuemembercount_dep); err |= ast_custom_function_register(&queuememberlist_function); err |= ast_custom_function_register(&queuegetchannel_function); err |= ast_custom_function_register(&queuewaitingcount_function);