kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- simplify a few statements with ARRAY_LEN()

Browse Source 
- constify the stregy int to string mappings array


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105984 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-05 04:34:29 +00:00
parent a760a033e9
commit 5403b28778
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_queue.c
View File

@@ -117,9 +117,9 @@ enum {
QUEUE_STRATEGY_WRANDOM QUEUE_STRATEGY_WRANDOM
}; };
static struct strategy { static const struct strategy {
int strategy; int strategy;
char *name; const char *name;
} strategies[] = { } strategies[] = {
{ QUEUE_STRATEGY_RINGALL, "ringall" }, { QUEUE_STRATEGY_RINGALL, "ringall" },
{ QUEUE_STRATEGY_LEASTRECENT, "leastrecent" }, { QUEUE_STRATEGY_LEASTRECENT, "leastrecent" },
@@ -516,7 +516,7 @@ static void set_queue_result(struct ast_channel *chan, enum queue_result res)
{ {
int i; int i;
for (i = 0; i < sizeof(queue_results) / sizeof(queue_results[0]); i++) { for (i = 0; i < ARRAY_LEN(queue_results); i++) {
if (queue_results[i].id == res) { if (queue_results[i].id == res) {
pbx_builtin_setvar_helper(chan, "QUEUESTATUS", queue_results[i].text); pbx_builtin_setvar_helper(chan, "QUEUESTATUS", queue_results[i].text);
return; return;
@@ -524,11 +524,11 @@ static void set_queue_result(struct ast_channel *chan, enum queue_result res)
} }
} }
static char *int2strat(int strategy) static const char *int2strat(int strategy)
{ {
int x; int x;
for (x = 0; x < sizeof(strategies) / sizeof(strategies[0]); x++) { for (x = 0; x < ARRAY_LEN(strategies); x++) {
if (strategy == strategies[x].strategy) if (strategy == strategies[x].strategy)
return strategies[x].name; return strategies[x].name;
} }
@@ -540,7 +540,7 @@ static int strat2int(const char *strategy)
{ {
int x; int x;
for (x = 0; x < sizeof(strategies) / sizeof(strategies[0]); x++) { for (x = 0; x < ARRAY_LEN(strategies); x++) {
if (!strcasecmp(strategy, strategies[x].name)) if (!strcasecmp(strategy, strategies[x].name))
return strategies[x].strategy; return strategies[x].strategy;
} }
@@ -574,7 +574,6 @@ static inline struct call_queue *queue_unref(struct call_queue *q)
static void set_queue_variables(struct queue_ent *qe) static void set_queue_variables(struct queue_ent *qe)
{ {
char interfacevar[256]=""; char interfacevar[256]="";
float sl = 0; float sl = 0;