Author: mturk
Date: Mon Nov 14 06:49:34 2011
New Revision: 1201609
URL: http://svn.apache.org/viewvc?rev=1201609&view=rev
Log:
Fix code style. No functional change
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_util.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1201609&r1=1201608&r2=1201609&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Nov 14 06:49:34 2011
@@ -372,8 +372,9 @@ int jk_resolve(const char *host, int por
temp_sa = temp_sa->next;
/* if temp_sa is set, we have a valid address otherwise, just return */
- if (NULL != temp_sa)
+ if (NULL != temp_sa) {
remote_sa = temp_sa;
+ }
else {
JK_TRACE_EXIT(l);
return JK_FALSE;
Modified: tomcat/jk/trunk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_lb_worker.c?rev=1201609&r1=1201608&r2=1201609&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Mon Nov 14 06:49:34 2011
@@ -161,12 +161,11 @@ int jk_lb_get_lock_code(const char *v)
{
if (!v)
return JK_LB_LOCK_DEF;
- else if (*v == 'o' || *v == 'O' || *v == '0')
+ if (*v == 'o' || *v == 'O' || *v == '0')
return JK_LB_LOCK_OPTIMISTIC;
- else if (*v == 'p' || *v == 'P' || *v == '1')
+ if (*v == 'p' || *v == 'P' || *v == '1')
return JK_LB_LOCK_PESSIMISTIC;
- else
- return JK_LB_LOCK_DEF;
+ return JK_LB_LOCK_DEF;
}
/* Return the string representation of the lb method type */
@@ -180,18 +179,17 @@ int jk_lb_get_method_code(const char *v)
{
if (!v)
return JK_LB_METHOD_DEF;
- else if (*v == 'r' || *v == 'R' || *v == '0')
+ if (*v == 'r' || *v == 'R' || *v == '0')
return JK_LB_METHOD_REQUESTS;
- else if (*v == 't' || *v == 'T' || *v == '1')
+ if (*v == 't' || *v == 'T' || *v == '1')
return JK_LB_METHOD_TRAFFIC;
- else if (*v == 'b' || *v == 'B' || *v == '2')
+ if (*v == 'b' || *v == 'B' || *v == '2')
return JK_LB_METHOD_BUSYNESS;
- else if (*v == 's' || *v == 'S' || *v == '3')
+ if (*v == 's' || *v == 'S' || *v == '3')
return JK_LB_METHOD_SESSIONS;
- else if (*v == 'n' || *v == 'N' || *v == '4')
+ if (*v == 'n' || *v == 'N' || *v == '4')
return JK_LB_METHOD_NEXT;
- else
- return JK_LB_METHOD_DEF;
+ return JK_LB_METHOD_DEF;
}
/* Return the string representation of the balance worker state */
@@ -205,22 +203,21 @@ int jk_lb_get_state_code(const char *v)
{
if (!v)
return JK_LB_STATE_DEF;
- else if (*v == 'i' || *v == 'I' || *v == 'n' || *v == 'N' || *v == '0')
+ if (*v == 'i' || *v == 'I' || *v == 'n' || *v == 'N' || *v == '0')
return JK_LB_STATE_IDLE;
- else if (*v == 'o' || *v == 'O' || *v == '1')
+ if (*v == 'o' || *v == 'O' || *v == '1')
return JK_LB_STATE_OK;
- else if (*v == 'r' || *v == 'R' || *v == '2')
+ if (*v == 'r' || *v == 'R' || *v == '2')
return JK_LB_STATE_RECOVER;
- else if (*v == 'f' || *v == 'F' || *v == '3')
+ if (*v == 'f' || *v == 'F' || *v == '3')
return JK_LB_STATE_FORCE;
- else if (*v == 'b' || *v == 'B' || *v == '4')
+ if (*v == 'b' || *v == 'B' || *v == '4')
return JK_LB_STATE_BUSY;
- else if (*v == 'e' || *v == 'E' || *v == '5')
+ if (*v == 'e' || *v == 'E' || *v == '5')
return JK_LB_STATE_ERROR;
- else if (*v == 'p' || *v == 'P' || *v == '6')
+ if (*v == 'p' || *v == 'P' || *v == '6')
return JK_LB_STATE_PROBE;
- else
- return JK_LB_STATE_DEF;
+ return JK_LB_STATE_DEF;
}
/* Return the string representation of the balance worker activation */
@@ -241,14 +238,13 @@ int jk_lb_get_activation_code(const char
{
if (!v)
return JK_LB_ACTIVATION_DEF;
- else if (*v == 'a' || *v == 'A' || *v == '0')
+ if (*v == 'a' || *v == 'A' || *v == '0')
return JK_LB_ACTIVATION_ACTIVE;
- else if (*v == 'd' || *v == 'D' || *v == '1')
+ if (*v == 'd' || *v == 'D' || *v == '1')
return JK_LB_ACTIVATION_DISABLED;
- else if (*v == 's' || *v == 'S' || *v == '2')
+ if (*v == 's' || *v == 'S' || *v == '2')
return JK_LB_ACTIVATION_STOPPED;
- else
- return JK_LB_ACTIVATION_DEF;
+ return JK_LB_ACTIVATION_DEF;
}
/* Update the load multipliers wrt. lb_factor */
@@ -981,8 +977,9 @@ static int get_most_suitable_worker(jk_w
return -1;
}
}
- if (p->lblock == JK_LB_LOCK_PESSIMISTIC)
+ if (p->lblock == JK_LB_LOCK_PESSIMISTIC) {
r = jk_shm_lock();
+ }
else {
JK_ENTER_CS(&(p->cs), r);
}
@@ -1015,8 +1012,9 @@ static int get_most_suitable_worker(jk_w
rc = find_bysession_route(s, p, session_route, states, l);
if (rc >= 0) {
lb_sub_worker_t *wr = &(p->lb_workers[rc]);
- if (p->lblock == JK_LB_LOCK_PESSIMISTIC)
+ if (p->lblock == JK_LB_LOCK_PESSIMISTIC) {
jk_shm_unlock();
+ }
else {
JK_LEAVE_CS(&(p->cs), r);
}
@@ -1033,8 +1031,9 @@ static int get_most_suitable_worker(jk_w
rc = -1;
}
if (rc < 0 && p->sticky_session_force) {
- if (p->lblock == JK_LB_LOCK_PESSIMISTIC)
+ if (p->lblock == JK_LB_LOCK_PESSIMISTIC) {
jk_shm_unlock();
+ }
else {
JK_LEAVE_CS(&(p->cs), r);
}
@@ -1046,8 +1045,9 @@ static int get_most_suitable_worker(jk_w
}
}
rc = find_best_worker(s, p, states, l);
- if (p->lblock == JK_LB_LOCK_PESSIMISTIC)
+ if (p->lblock == JK_LB_LOCK_PESSIMISTIC) {
jk_shm_unlock();
+ }
else {
JK_LEAVE_CS(&(p->cs), r);
}
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1201609&r1=1201608&r2=1201609&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Mon Nov 14 06:49:34 2011
@@ -347,13 +347,13 @@ int jk_get_bool_code(const char *v, int
if (!v) {
return def;
}
- else if (!strcasecmp(v, "off") ||
+ if (!strcasecmp(v, "off") ||
*v == 'F' || *v == 'f' ||
*v == 'N' || *v == 'n' ||
(*v == '0' && *(v + 1) == '\0')) {
return 0;
}
- else if (!strcasecmp(v, "on") ||
+ if (!strcasecmp(v, "on") ||
*v == 'T' || *v == 't' ||
*v == 'Y' || *v == 'y' ||
(*v == '1' && *(v + 1) == '\0')) {
@@ -565,30 +565,18 @@ static int JK_METHOD log_to_file(jk_logg
int jk_parse_log_level(const char *level)
{
- if (0 == strcasecmp(level, JK_LOG_TRACE_VERB)) {
+ if (!strcasecmp(level, JK_LOG_TRACE_VERB))
return JK_LOG_TRACE_LEVEL;
- }
-
- if (0 == strcasecmp(level, JK_LOG_DEBUG_VERB)) {
+ if (!strcasecmp(level, JK_LOG_DEBUG_VERB))
return JK_LOG_DEBUG_LEVEL;
- }
-
- if (0 == strcasecmp(level, JK_LOG_INFO_VERB)) {
+ if (!strcasecmp(level, JK_LOG_INFO_VERB))
return JK_LOG_INFO_LEVEL;
- }
-
- if (0 == strcasecmp(level, JK_LOG_WARN_VERB)) {
+ if (!strcasecmp(level, JK_LOG_WARN_VERB))
return JK_LOG_WARNING_LEVEL;
- }
-
- if (0 == strcasecmp(level, JK_LOG_ERROR_VERB)) {
+ if (!strcasecmp(level, JK_LOG_ERROR_VERB))
return JK_LOG_ERROR_LEVEL;
- }
-
- if (0 == strcasecmp(level, JK_LOG_EMERG_VERB)) {
+ if (!strcasecmp(level, JK_LOG_EMERG_VERB))
return JK_LOG_EMERG_LEVEL;
- }
-
return JK_LOG_DEF_LEVEL;
}
@@ -776,7 +764,8 @@ int jk_log(jk_logger_t *l,
va_end(args);
if ( rc <= usable_size - used ) {
used += rc;
- } else {
+ }
+ else {
used = usable_size;
}
l->log(l, level, used, buf);
@@ -1242,6 +1231,7 @@ int jk_get_is_worker_disabled(jk_map_t *
{
int rc = JK_TRUE;
char buf[1024];
+
if (m && wname) {
int value;
MAKE_WORKER_PARAM(IS_WORKER_DISABLED_DEPRECATED);
@@ -1256,6 +1246,7 @@ int jk_get_is_worker_stopped(jk_map_t *m
{
int rc = JK_TRUE;
char buf[1024];
+
if (m && wname) {
int value;
MAKE_WORKER_PARAM(IS_WORKER_STOPPED_DEPRECATED);
@@ -1270,21 +1261,20 @@ int jk_get_worker_activation(jk_map_t *m
{
char buf[1024];
const char *v;
+
if (!m || !wname) {
return JK_LB_ACTIVATION_ACTIVE;
}
MAKE_WORKER_PARAM(ACTIVATION_OF_WORKER);
v = jk_map_get_string(m, buf, NULL);
- if (v) {
+ if (v)
return jk_lb_get_activation_code(v);
- }
- else if (jk_get_is_worker_stopped(m, wname))
+ if (jk_get_is_worker_stopped(m, wname))
return JK_LB_ACTIVATION_STOPPED;
- else if (jk_get_is_worker_disabled(m, wname))
+ if (jk_get_is_worker_disabled(m, wname))
return JK_LB_ACTIVATION_DISABLED;
- else
- return JK_LB_ACTIVATION_DEF;
+ return JK_LB_ACTIVATION_DEF;
}
int jk_get_lb_factor(jk_map_t *m, const char *wname)
@@ -1317,6 +1307,7 @@ int jk_get_is_sticky_session(jk_map_t *m
{
int rc = JK_TRUE;
char buf[1024];
+
if (m && wname) {
int value;
MAKE_WORKER_PARAM(STICKY_SESSION);
@@ -1331,6 +1322,7 @@ int jk_get_is_sticky_session_force(jk_ma
{
int rc = JK_FALSE;
char buf[1024];
+
if (m && wname) {
int value;
MAKE_WORKER_PARAM(STICKY_SESSION_FORCE);
@@ -1345,6 +1337,7 @@ int jk_get_lb_method(jk_map_t *m, const
{
char buf[1024];
const char *v;
+
if (!m || !wname) {
return JK_LB_METHOD_DEF;
}
@@ -1358,6 +1351,7 @@ int jk_get_lb_lock(jk_map_t *m, const ch
{
char buf[1024];
const char *v;
+
if (!m || !wname) {
return JK_LB_LOCK_DEF;
}
@@ -1391,6 +1385,7 @@ int jk_get_worker_fail_on_status(jk_map_
int *list, unsigned int list_size)
{
char buf[1024];
+
if (!m || !wname || !list) {
return 0;
}
@@ -1408,6 +1403,7 @@ int jk_get_worker_user_case_insensitive(
{
int rc = JK_FALSE;
char buf[1024];
+
if (m && wname) {
int value;
MAKE_WORKER_PARAM(USER_CASE_OF_WORKER);
@@ -1436,6 +1432,7 @@ const char *jk_get_worker_name_space(jk_
{
const char *rc;
char buf[1024];
+
if (!m || !wname) {
return NULL;
}
@@ -1451,6 +1448,7 @@ const char *jk_get_worker_xmlns(jk_map_t
{
const char *rc;
char buf[1024];
+
if (!m || !wname) {
return NULL;
}
@@ -1465,6 +1463,7 @@ const char *jk_get_worker_xmlns(jk_map_t
const char *jk_get_worker_xml_doctype(jk_map_t *m, const char *wname, const
char *def)
{
char buf[1024];
+
if (!m || !wname) {
return NULL;
}
@@ -1475,6 +1474,7 @@ const char *jk_get_worker_xml_doctype(jk
const char *jk_get_worker_prop_prefix(jk_map_t *m, const char *wname, const
char *def)
{
char buf[1024];
+
if (!m || !wname) {
return NULL;
}
@@ -1486,6 +1486,7 @@ int jk_get_is_read_only(jk_map_t *m, con
{
int rc = JK_FALSE;
char buf[1024];
+
if (m && wname) {
int value;
MAKE_WORKER_PARAM(READ_ONLY_OF_WORKER);
@@ -1777,7 +1778,7 @@ int jk_file_exists(const char *f)
struct stat st;
if ((0 == jk_stat(f, &st)) && (st.st_mode & S_IFREG))
- return JK_TRUE;
+ return JK_TRUE;
}
return JK_FALSE;
@@ -1796,7 +1797,7 @@ static int jk_is_some_property(const cha
suffix_len = strlen(buf);
if (prp_name_len >= suffix_len) {
const char *prp_suffix = prp_name + prp_name_len - suffix_len;
- if (0 == strcmp(buf, prp_suffix)) {
+ if (!strcmp(buf, prp_suffix)) {
return JK_TRUE;
}
}
@@ -1818,6 +1819,7 @@ int jk_is_cmd_line_property(const char *
int jk_is_list_property(const char *prp_name)
{
const char **props = &list_properties[0];
+
while (*props) {
if (jk_is_some_property(prp_name, *props, "."))
return JK_TRUE;
@@ -1829,6 +1831,7 @@ int jk_is_list_property(const char *prp_
int jk_is_unique_property(const char *prp_name)
{
const char **props = &unique_properties[0];
+
while (*props) {
if (jk_is_some_property(prp_name, *props, "."))
return JK_TRUE;
@@ -1840,6 +1843,7 @@ int jk_is_unique_property(const char *pr
int jk_is_deprecated_property(const char *prp_name)
{
const char **props = &deprecated_properties[0];
+
while (*props) {
if (jk_is_some_property(prp_name, *props, "."))
return JK_TRUE;
@@ -1854,6 +1858,7 @@ int jk_is_deprecated_property(const char
int jk_is_valid_property(const char *prp_name)
{
const char **props;
+
if (memcmp(prp_name, "worker.", 7))
return JK_TRUE;
@@ -1933,6 +1938,7 @@ int jk_get_worker_libpath(jk_map_t *m, c
const char *jk_get_lb_session_cookie(jk_map_t *m, const char *wname, const
char *def)
{
char buf[1024];
+
if (!m || !wname) {
return NULL;
}
@@ -1943,6 +1949,7 @@ const char *jk_get_lb_session_cookie(jk_
const char *jk_get_lb_session_path(jk_map_t *m, const char *wname, const char
*def)
{
char buf[1024];
+
if (!m || !wname) {
return NULL;
}
@@ -1956,10 +1963,11 @@ int is_http_status_fail(unsigned int htt
{
unsigned int i;
int soft_status = -1 * status;
+
for (i = 0; i < http_status_fail_num; i++) {
if (http_status_fail[i] == status)
return 1;
- else if (http_status_fail[i] == soft_status)
+ if (http_status_fail[i] == soft_status)
return -1;
}
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
