kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-02 11:29:48 +00:00
Code Issues Projects Releases Wiki Activity

switch_dow_cmp: fix logic err in my latest commit

Browse Source
This commit is contained in:
Mathieu Rene 2010-10-28 10:37:06 -04:00
parent 6cfdddef6a
commit 43aeb3b858
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/switch_utils.c
View File

@ -2537,7 +2537,7 @@ static inline dow_t _dow_read_token(const char **s)
SWITCH_DECLARE(switch_bool_t) switch_dow_cmp(const char *exp, int val) SWITCH_DECLARE(switch_bool_t) switch_dow_cmp(const char *exp, int val)
{ {
dow_t cur, prev = DOW_EOF; dow_t cur, prev = DOW_EOF, range_start = DOW_EOF;
const char *p = exp; const char *p = exp;
while ((cur = _dow_read_token(&p)) != DOW_EOF) { while ((cur = _dow_read_token(&p)) != DOW_EOF) {
@ -2545,27 +2545,30 @@ SWITCH_DECLARE(switch_bool_t) switch_dow_cmp(const char *exp, int val)
/* Reset state */ /* Reset state */
cur = prev = DOW_EOF; cur = prev = DOW_EOF;
} else if (cur == DOW_HYPHEN) { } else if (cur == DOW_HYPHEN) {
/* Save the current token and move to the next one */ /* Save the previous token and move to the next one */
prev = cur; range_start = prev;
} else if (cur == DOW_ERR) { } else if (cur == DOW_ERR) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse error for [%s] at position %td (%.6s)\n", exp, p - exp, p); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse error for [%s] at position %td (%.6s)\n", exp, p - exp, p);
break; break;
} else { } else {
/* Valid day found */ /* Valid day found */
if (prev != DOW_EOF) { /* Evaluating a range */ if (range_start != DOW_EOF) { /* Evaluating a range */
if (prev < cur) { if (range_start < cur) {
if (val >= prev && val <= cur) { if (val >= range_start && val <= cur) {
return SWITCH_TRUE; return SWITCH_TRUE;
} }
} else { } else {
if (val >= cur && val <= prev) { if (val >= cur && val <= range_start) {
return SWITCH_TRUE; return SWITCH_TRUE;
} }
} }
range_start = DOW_EOF;
} else if (val == cur) { } else if (val == cur) {
return SWITCH_TRUE; return SWITCH_TRUE;
} }
} }
prev = cur;
} }
return SWITCH_FALSE; return SWITCH_FALSE;