kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

there is no need for conditional logic to select ->interface or ->membername, snince ->membername will always be populated

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@82834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2007-09-18 18:59:52 +00:00
parent 885a35488a
commit a809a030d9
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app_queue.c
View File

@@ -3773,7 +3773,6 @@ static int queue_function_queuememberlist(struct ast_channel *chan, char *cmd, c
if (q) { if (q) {
int buflen = 0, count = 0; int buflen = 0, count = 0;
struct ao2_iterator mem_iter = ao2_iterator_init(q->members, 0); struct ao2_iterator mem_iter = ao2_iterator_init(q->members, 0);
const char *name_to_list;
while ((m = ao2_iterator_next(&mem_iter))) { while ((m = ao2_iterator_next(&mem_iter))) {
/* strcat() is always faster than printf() */ /* strcat() is always faster than printf() */
@@ -3781,9 +3780,8 @@ static int queue_function_queuememberlist(struct ast_channel *chan, char *cmd, c
strncat(buf + buflen, ",", len - buflen - 1); strncat(buf + buflen, ",", len - buflen - 1);
buflen++; buflen++;
} }
name_to_list = ast_strlen_zero(m->membername) ? m->interface : m->membername; strncat(buf + buflen, m->membername, len - buflen - 1);
strncat(buf + buflen, name_to_list, len - buflen - 1); buflen += strlen(m->membername);
buflen += strlen(name_to_list);
/* Safeguard against overflow (negative length) */ /* Safeguard against overflow (negative length) */
if (buflen >= len - 2) { if (buflen >= len - 2) {
ao2_ref(m, -1); ao2_ref(m, -1);
@@ -4113,13 +4111,9 @@ static int __queues_show(struct mansession *s, int manager, int fd, int argc, ch
} else } else
ast_build_string(&max, &max_left, " has taken no calls yet"); ast_build_string(&max, &max_left, " has taken no calls yet");
if (s) if (s)
astman_append(s, " %s%s%s", astman_append(s, " %s%s%s", mem->membername, max_buf, term);
ast_strlen_zero(mem->membername) ? mem->interface : mem->membername,
max_buf, term);
else else
ast_cli(fd, " %s%s%s", ast_cli(fd, " %s%s%s", mem->membername, max_buf, term);
ast_strlen_zero(mem->membername) ? mem->interface : mem->membername,
max_buf, term);
ao2_ref(mem, -1); ao2_ref(mem, -1);
} }
} else if (s) } else if (s)
@@ -4547,7 +4541,7 @@ static char *complete_queue_remove_member(const char *line, const char *word, in
if (++which > state) { if (++which > state) {
char *tmp; char *tmp;
ast_mutex_unlock(&q->lock); ast_mutex_unlock(&q->lock);
tmp = ast_strdup((ast_strlen_zero(m->membername) ? m->interface : m->membername)); tmp = m->membername;
ao2_ref(m, -1); ao2_ref(m, -1);
return tmp; return tmp;
} }