FS-5214 --resolve

This commit is contained in:
Anthony Minessale 2013-03-25 17:02:05 -05:00
parent 772e9f4c70
commit b6ed7c26c3
1 changed files with 10 additions and 7 deletions

View File

@ -415,14 +415,15 @@ SWITCH_DECLARE(char *) switch_find_parameter(const char *str, const char *param,
\param expr a string expression \param expr a string expression
\return true or false \return true or false
*/ */
static inline int switch_true(const char *expr) static inline int switch_true(const char *expr)
{ {
return ((expr && ( !strcasecmp(expr, "yes") || return ((expr && ( !strcasecmp(expr, "yes") ||
!strcasecmp(expr, "on") || !strcasecmp(expr, "on") ||
!strcasecmp(expr, "true") || !strcasecmp(expr, "true") ||
!strcasecmp(expr, "enabled") || !strcasecmp(expr, "t") ||
!strcasecmp(expr, "active") || !strcasecmp(expr, "enabled") ||
!strcasecmp(expr, "allow") || !strcasecmp(expr, "active") ||
!strcasecmp(expr, "allow") ||
(switch_is_number(expr) && atoi(expr)))) ? SWITCH_TRUE : SWITCH_FALSE); (switch_is_number(expr) && atoi(expr)))) ? SWITCH_TRUE : SWITCH_FALSE);
} }
@ -430,6 +431,7 @@ static inline int switch_true(const char *expr)
((( !strcasecmp(expr, "yes") ||\ ((( !strcasecmp(expr, "yes") ||\
!strcasecmp(expr, "on") ||\ !strcasecmp(expr, "on") ||\
!strcasecmp(expr, "true") ||\ !strcasecmp(expr, "true") ||\
!strcasecmp(expr, "t") ||\
!strcasecmp(expr, "enabled") ||\ !strcasecmp(expr, "enabled") ||\
!strcasecmp(expr, "active") ||\ !strcasecmp(expr, "active") ||\
!strcasecmp(expr, "allow") ||\ !strcasecmp(expr, "allow") ||\
@ -445,6 +447,7 @@ static inline int switch_false(const char *expr)
return ((expr && ( !strcasecmp(expr, "no") || return ((expr && ( !strcasecmp(expr, "no") ||
!strcasecmp(expr, "off") || !strcasecmp(expr, "off") ||
!strcasecmp(expr, "false") || !strcasecmp(expr, "false") ||
!strcasecmp(expr, "f") ||
!strcasecmp(expr, "disabled") || !strcasecmp(expr, "disabled") ||
!strcasecmp(expr, "inactive") || !strcasecmp(expr, "inactive") ||
!strcasecmp(expr, "disallow") || !strcasecmp(expr, "disallow") ||