mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 12:36:58 +00:00
Merge the dialplan_aesthetics branch. Most of this patch simply converts applications
using old methods of parsing arguments to using the standard macros. However, the big change is that the really old way of specifying application and arguments separated by a comma will no longer work (e.g. NoOp,foo|bar). Instead, the way that has been recommended since long before 1.0 will become the only method available (e.g. NoOp(foo,bar). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -930,11 +930,11 @@ static void queue_set_param(struct call_queue *q, const char *param, const char
|
||||
else
|
||||
q->announceholdtime = 0;
|
||||
} else if (!strcasecmp(param, "periodic-announce")) {
|
||||
if (strchr(val, '|')) {
|
||||
if (strchr(val, ',')) {
|
||||
char *s, *buf = ast_strdupa(val);
|
||||
unsigned int i = 0;
|
||||
|
||||
while ((s = strsep(&buf, "|"))) {
|
||||
while ((s = strsep(&buf, ",|"))) {
|
||||
ast_copy_string(q->sound_periodicannounce[i], s, sizeof(q->sound_periodicannounce[i]));
|
||||
i++;
|
||||
if (i == MAX_PERIODIC_ANNOUNCEMENTS)
|
||||
@@ -3179,7 +3179,7 @@ static void reload_queue_members(void)
|
||||
continue;
|
||||
|
||||
cur_ptr = queue_data;
|
||||
while ((member = strsep(&cur_ptr, "|"))) {
|
||||
while ((member = strsep(&cur_ptr, ",|"))) {
|
||||
if (ast_strlen_zero(member))
|
||||
continue;
|
||||
|
||||
|
Reference in New Issue
Block a user