kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-23 21:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't duplicate devicestate-to-string function (issue #5078)

Browse Source 
use ast_build_string() for building output string


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-08-31 20:16:47 +00:00
parent 5b819fc101
commit 3103fd6292
1 changed files with 21 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
apps/app_queue.c
View File

@@ -3157,33 +3157,6 @@ static void reload_queues(void)
ast_mutex_unlock(&qlock); ast_mutex_unlock(&qlock);
} }
static char *status2str(int status, char *buf, int buflen)
{
switch(status) {
case AST_DEVICE_UNKNOWN:
ast_copy_string(buf, "available", buflen);
break;
case AST_DEVICE_NOT_INUSE:
ast_copy_string(buf, "notinuse", buflen);
break;
case AST_DEVICE_INUSE:
ast_copy_string(buf, "inuse", buflen);
break;
case AST_DEVICE_BUSY:
ast_copy_string(buf, "busy", buflen);
break;
case AST_DEVICE_INVALID:
ast_copy_string(buf, "invalid", buflen);
break;
case AST_DEVICE_UNAVAILABLE:
ast_copy_string(buf, "unavailable", buflen);
break;
default:
snprintf(buf, buflen, "unknown status %d", status);
}
return buf;
}
static int __queues_show(int fd, int argc, char **argv, int queue_show) static int __queues_show(int fd, int argc, char **argv, int queue_show)
{ {
struct ast_call_queue *q; struct ast_call_queue *q;
@@ -3191,9 +3164,9 @@ static int __queues_show(int fd, int argc, char **argv, int queue_show)
struct member *mem; struct member *mem;
int pos; int pos;
time_t now; time_t now;
char max[80] = ""; char max_buf[80];
char calls[80] = ""; char *max;
char tmpbuf[80] = ""; size_t max_left;
float sl = 0; float sl = 0;
time(&now); time(&now);
@@ -3209,7 +3182,7 @@ static int __queues_show(int fd, int argc, char **argv, int queue_show)
ast_cli(fd, "No queues.\n"); ast_cli(fd, "No queues.\n");
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
while(q) { while (q) {
ast_mutex_lock(&q->lock); ast_mutex_lock(&q->lock);
if (queue_show) { if (queue_show) {
if (strcasecmp(q->name, argv[2]) != 0) { if (strcasecmp(q->name, argv[2]) != 0) {
@@ -3222,10 +3195,13 @@ static int __queues_show(int fd, int argc, char **argv, int queue_show)
continue; continue;
} }
} }
max_buf[0] = '\0';
max = max_buf;
max_left = sizeof(max_buf);
if (q->maxlen) if (q->maxlen)
snprintf(max, sizeof(max), "%d", q->maxlen); ast_build_string(&max, &max_left, "%d", q->maxlen);
else else
ast_copy_string(max, "unlimited", sizeof(max)); ast_build_string(&max, &max_left, "unlimited");
sl = 0; sl = 0;
if(q->callscompleted > 0) if(q->callscompleted > 0)
sl = 100*((float)q->callscompletedinsl/(float)q->callscompleted); sl = 100*((float)q->callscompletedinsl/(float)q->callscompleted);
@@ -3234,21 +3210,22 @@ static int __queues_show(int fd, int argc, char **argv, int queue_show)
if (q->members) { if (q->members) {
ast_cli(fd, " Members: \n"); ast_cli(fd, " Members: \n");
for (mem = q->members; mem; mem = mem->next) { for (mem = q->members; mem; mem = mem->next) {
max_buf[0] = '\0';
max = max_buf;
max_left = sizeof(max_buf);
if (mem->penalty) if (mem->penalty)
snprintf(max, sizeof(max) - 20, " with penalty %d", mem->penalty); ast_build_string(&max, &max_left, " with penalty %d", mem->penalty);
else
max[0] = '\0';
if (mem->dynamic) if (mem->dynamic)
strncat(max, " (dynamic)", sizeof(max) - strlen(max) - 1); ast_build_string(&max, &max_left, " (dynamic)");
if (mem->paused) if (mem->paused)
strncat(max, " (paused)", sizeof(max) - strlen(max) - 1); ast_build_string(&max, &max_left, " (paused)");
snprintf(max + strlen(max), sizeof(max) - strlen(max), " (%s)", status2str(mem->status, tmpbuf, sizeof(tmpbuf))); ast_build_string(&max, &max_left, " (%s)", devstate2str(mem->status));
if (mem->calls) { if (mem->calls) {
snprintf(calls, sizeof(calls), " has taken %d calls (last was %ld secs ago)", ast_build_string(&max, &max_left, " has taken %d calls (last was %ld secs ago)",
mem->calls, (long)(time(NULL) - mem->lastcall)); mem->calls, (long)(time(NULL) - mem->lastcall));
} else } else
ast_copy_string(calls, " has taken no calls yet", sizeof(calls)); ast_build_string(&max, &max_left, " has taken no calls yet");
ast_cli(fd, " %s%s%s\n", mem->interface, max, calls); ast_cli(fd, " %s%s\n", mem->interface, max);
} }
} else } else
ast_cli(fd, " No Members\n"); ast_cli(fd, " No Members\n");
@@ -3257,7 +3234,7 @@ static int __queues_show(int fd, int argc, char **argv, int queue_show)
ast_cli(fd, " Callers: \n"); ast_cli(fd, " Callers: \n");
for (qe = q->head; qe; qe = qe->next) for (qe = q->head; qe; qe = qe->next)
ast_cli(fd, " %d. %s (wait: %ld:%2.2ld, prio: %d)\n", pos++, qe->chan->name, ast_cli(fd, " %d. %s (wait: %ld:%2.2ld, prio: %d)\n", pos++, qe->chan->name,
(long)(now - qe->start) / 60, (long)(now - qe->start) % 60, qe->prio); (long)(now - qe->start) / 60, (long)(now - qe->start) % 60, qe->prio);
} else } else
ast_cli(fd, " No Callers\n"); ast_cli(fd, " No Callers\n");
ast_cli(fd, "\n"); ast_cli(fd, "\n");