Author: rjung Date: Sat Dec 9 15:41:01 2006 New Revision: 485091 URL: http://svn.apache.org/viewvc?view=rev&rev=485091 Log: Introduce general pupose conversion function int -> string and string -> int. Use it in map and in status worker.
Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c tomcat/connectors/trunk/jk/native/common/jk_status.c tomcat/connectors/trunk/jk/native/common/jk_util.c tomcat/connectors/trunk/jk/native/common/jk_util.h Modified: tomcat/connectors/trunk/jk/native/common/jk_map.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_map.c?view=diff&rev=485091&r1=485090&r2=485091 ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_map.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_map.c Sat Dec 9 15:41:01 2006 @@ -234,21 +234,12 @@ int jk_map_get_bool(jk_map_t *m, const char *name, int def) { char buf[100]; - size_t len; const char *rc; - int rv = 0; sprintf(buf, "%d", def); rc = jk_map_get_string(m, name, buf); - len = strlen(rc); - if (len) { - if (strcasecmp(rc, "true") == 0 || - *rc == 'Y' || *rc == 'y' || *rc == '1') { - rv = 1; - } - } - return rv; + return jk_get_bool_code(rc, def); } char **jk_map_get_string_list(jk_map_t *m, Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?view=diff&rev=485091&r1=485090&r2=485091 ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_status.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sat Dec 9 15:41:01 2006 @@ -689,14 +689,6 @@ } -static const char *status_val_bool(int v) -{ - if (v == 0) - return "False"; - else - return "True"; -} - static int status_get_string(status_endpoint_t *p, const char *param, const char *def, @@ -742,19 +734,11 @@ jk_logger_t *l) { const char *arg; - int rv = def; if (status_get_string(p, param, NULL, &arg, l) == JK_TRUE) { - if (strcasecmp(arg, "on") == 0 || - strcasecmp(arg, "true") == 0 || - strcasecmp(arg, "1") == 0) - rv = 1; - else if (strcasecmp(arg, "off") == 0 || - strcasecmp(arg, "false") == 0 || - strcasecmp(arg, "0") == 0) - rv = 0; + return jk_get_bool_code(arg, def); } - return rv; + return def; } const char *status_cmd_text(int cmd) @@ -1213,8 +1197,8 @@ jk_puts(s, "<table>" JK_STATUS_SHOW_LB_HEAD); jk_printf(s, JK_STATUS_SHOW_LB_ROW, status_worker_type(JK_LB_WORKER_TYPE), - status_val_bool(lb->sticky_session), - status_val_bool(lb->sticky_session_force), + jk_get_bool(lb->sticky_session), + jk_get_bool(lb->sticky_session_force), lb->retries, jk_lb_get_method(lb, l), jk_lb_get_lock(lb, l), @@ -1237,8 +1221,8 @@ jk_print_xml_start_elt(s, w, 2, 0, "balancer"); jk_print_xml_att_string(s, 4, "name", name); jk_print_xml_att_string(s, 4, "type", status_worker_type(JK_LB_WORKER_TYPE)); - jk_print_xml_att_string(s, 4, "sticky_session", status_val_bool(lb->sticky_session)); - jk_print_xml_att_string(s, 4, "sticky_session_force", status_val_bool(lb->sticky_session_force)); + jk_print_xml_att_string(s, 4, "sticky_session", jk_get_bool(lb->sticky_session)); + jk_print_xml_att_string(s, 4, "sticky_session_force", jk_get_bool(lb->sticky_session_force)); jk_print_xml_att_int(s, 4, "retries", lb->retries); jk_print_xml_att_int(s, 4, "recover_time", lb->recover_wait_time); jk_print_xml_att_string(s, 4, "method", jk_lb_get_method(lb, l)); @@ -1257,8 +1241,8 @@ jk_puts(s, "Balancer Worker:"); jk_printf(s, " name=%s", name); jk_printf(s, " type=%s", status_worker_type(JK_LB_WORKER_TYPE)); - jk_printf(s, " sticky_session=%s", status_val_bool(lb->sticky_session)); - jk_printf(s, " sticky_session_force=%s", status_val_bool(lb->sticky_session_force)); + jk_printf(s, " sticky_session=%s", jk_get_bool(lb->sticky_session)); + jk_printf(s, " sticky_session_force=%s", jk_get_bool(lb->sticky_session_force)); jk_printf(s, " retries=%d", lb->retries); jk_printf(s, " recover_time=%d", lb->recover_wait_time); jk_printf(s, " method=%s", jk_lb_get_method(lb, l)); @@ -1276,8 +1260,8 @@ jk_print_prop_att_string(s, w, NULL, "list", name); jk_print_prop_att_string(s, w, name, "type", status_worker_type(JK_LB_WORKER_TYPE)); - jk_print_prop_att_string(s, w, name, "sticky_session", status_val_bool(lb->sticky_session)); - jk_print_prop_att_string(s, w, name, "sticky_session_force", status_val_bool(lb->sticky_session_force)); + jk_print_prop_att_string(s, w, name, "sticky_session", jk_get_bool(lb->sticky_session)); + jk_print_prop_att_string(s, w, name, "sticky_session_force", jk_get_bool(lb->sticky_session_force)); jk_print_prop_att_int(s, w, name, "retries", lb->retries); jk_print_prop_att_int(s, w, name, "recover_time", lb->recover_wait_time); jk_print_prop_att_string(s, w, name, "method", jk_lb_get_method(lb, l)); Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=485091&r1=485090&r2=485091 ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_util.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sat Dec 9 15:41:01 2006 @@ -218,6 +218,34 @@ NULL }; +const char *jk_get_bool(int v) +{ + if (v == 0) + return "False"; + else + return "True"; +} + +int jk_get_bool_code(const char *v, int def) +{ + if (!v) { + return def; + } + else if (!strcasecmp(v, "off") || + *v == 'F' || *v == 'f' || + *v == 'N' || *v == 'n' || + *v == '0') { + return 0; + } + else if (!strcasecmp(v, "on") || + *v == 'T' || *v == 't' || + *v == 'Y' || *v == 'y' || + *v == '1') { + return 1; + } + return def; +} + /* Sleep for 100ms */ void jk_sleep(int ms) { Modified: tomcat/connectors/trunk/jk/native/common/jk_util.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.h?view=diff&rev=485091&r1=485090&r2=485091 ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_util.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_util.h Sat Dec 9 15:41:01 2006 @@ -33,6 +33,10 @@ #define JK_SLEEP_DEF (100) +const char *jk_get_bool(int v); + +int jk_get_bool_code(const char *v, int def); + void jk_sleep(int ms); int jk_parse_log_level(const char *level); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]