kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 82834 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82834 | kpfleming | 2007-09-18 13:59:52 -0500 (Tue, 18 Sep 2007) | 2 lines

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2007-09-18 19:06:34 +00:00
parent 3d7cf301d8
commit ef87383055
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_queue.c
View File

@@ -3981,7 +3981,6 @@ static int queue_function_queuememberlist(struct ast_channel *chan, const char *
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() */
@@ -3989,9 +3988,8 @@ static int queue_function_queuememberlist(struct ast_channel *chan, const char *
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);
@@ -4294,7 +4292,7 @@ static int __queues_show(struct mansession *s, int fd, int argc, char **argv)
do_print(s, fd, " Members: "); do_print(s, fd, " Members: ");
mem_iter = ao2_iterator_init(q->members, 0); mem_iter = ao2_iterator_init(q->members, 0);
while ((mem = ao2_iterator_next(&mem_iter))) { while ((mem = ao2_iterator_next(&mem_iter))) {
ast_str_set(&out, 0, " %s", ast_strlen_zero(mem->membername) ? mem->interface : mem->membername); ast_str_set(&out, 0, " %s", mem->membername);
if (mem->penalty) if (mem->penalty)
ast_str_append(&out, 0, " with penalty %d", mem->penalty); ast_str_append(&out, 0, " with penalty %d", mem->penalty);
ast_str_append(&out, 0, "%s%s%s (%s)", ast_str_append(&out, 0, "%s%s%s (%s)",
@@ -4814,7 +4812,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;
} }