Author: rjung
Date: Thu Jul 10 20:34:06 2014
New Revision: 1609566
URL: http://svn.apache.org/r1609566
Log:
Standardize on %d instead of %i on output.
Both should be equivalent for any type of printf,
like the one used in jk_log().
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_lb_worker.c
tomcat/jk/trunk/native/common/jk_status.c
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1609566&r1=1609565&r2=1609566&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Thu Jul 10 20:34:06 2014
@@ -1976,8 +1976,8 @@ static int ajp_process_callback(jk_msg_b
*/
if (len > (unsigned int)(msg->len - 3)) {
jk_log(l, JK_LOG_ERROR,
- "Chunk length too large. Length of AJP message is %i,"
- " chunk length is %i.", msg->len, len);
+ "Chunk length too large. Length of AJP message is %d,"
+ " chunk length is %d.", msg->len, len);
JK_TRACE_EXIT(l);
return JK_INTERNAL_ERROR;
}
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=1609566&r1=1609565&r2=1609566&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_lb_worker.c (original)
+++ tomcat/jk/trunk/native/common/jk_lb_worker.c Thu Jul 10 20:34:06 2014
@@ -1764,7 +1764,7 @@ static int JK_METHOD validate(jk_worker_
}
if (JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
- "Balanced worker %i has name %s and route %s in
domain %s",
+ "Balanced worker %d has name %s and route %s in
domain %s",
i,
p->lb_workers[i].name,
p->lb_workers[i].route,
@@ -1777,7 +1777,7 @@ static int JK_METHOD validate(jk_worker_
for (j = 0; j < i; j++) {
if (strcmp(p->lb_workers[i].route,
p->lb_workers[j].route) == 0) {
jk_log(l, JK_LOG_ERROR,
- "Balanced workers number %i (%s) and %i
(%s) share the same route %s - aborting configuration!",
+ "Balanced workers number %d (%s) and %d
(%s) share the same route %s - aborting configuration!",
i,
p->lb_workers[i].name,
j,
Modified: tomcat/jk/trunk/native/common/jk_status.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_status.c?rev=1609566&r1=1609565&r2=1609566&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_status.c (original)
+++ tomcat/jk/trunk/native/common/jk_status.c Thu Jul 10 20:34:06 2014
@@ -3110,7 +3110,7 @@ static void commit_worker(jk_ws_service_
lb->retries, l);
if (i != lb->retries && i > 0) {
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting 'retries' for lb worker '%s' to
'%i'",
+ "Status worker '%s' setting 'retries' for lb worker '%s' to
'%d'",
w->name, name, i);
lb->retries = i;
sync_needed = JK_TRUE;
@@ -3119,7 +3119,7 @@ static void commit_worker(jk_ws_service_
lb->retry_interval, l);
if (i != lb->retry_interval && i > 0) {
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting 'retry_interval' for lb worker '%s'
to '%i'",
+ "Status worker '%s' setting 'retry_interval' for lb worker '%s'
to '%d'",
w->name, name, i);
lb->retry_interval = i;
sync_needed = JK_TRUE;
@@ -3128,7 +3128,7 @@ static void commit_worker(jk_ws_service_
lb->recover_wait_time, l);
if (i != lb->recover_wait_time && i > 0) {
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting 'recover_time' for lb worker '%s'
to '%i'",
+ "Status worker '%s' setting 'recover_time' for lb worker '%s'
to '%d'",
w->name, name, i);
lb->recover_wait_time = i;
sync_needed = JK_TRUE;
@@ -3137,7 +3137,7 @@ static void commit_worker(jk_ws_service_
lb->error_escalation_time, l);
if (i != lb->error_escalation_time && i > 0) {
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting 'error_escalation_time' for lb
worker '%s' to '%i'",
+ "Status worker '%s' setting 'error_escalation_time' for lb
worker '%s' to '%d'",
w->name, name, i);
lb->error_escalation_time = i;
sync_needed = JK_TRUE;
@@ -3146,7 +3146,7 @@ static void commit_worker(jk_ws_service_
lb->max_reply_timeouts, l);
if (i != lb->max_reply_timeouts && i >= 0) {
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting 'max_reply_timeouts' for lb worker
'%s' to '%i'",
+ "Status worker '%s' setting 'max_reply_timeouts' for lb worker
'%s' to '%d'",
w->name, name, i);
lb->max_reply_timeouts = i;
sync_needed = JK_TRUE;
@@ -3154,7 +3154,7 @@ static void commit_worker(jk_ws_service_
i = status_get_bool(p, JK_STATUS_ARG_LB_STICKY, lb->sticky_session, l);
if (i != lb->sticky_session) {
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting 'sticky_session' for lb worker '%s'
to '%i'",
+ "Status worker '%s' setting 'sticky_session' for lb worker '%s'
to '%d'",
w->name, name, i);
lb->sticky_session = i;
sync_needed = JK_TRUE;
@@ -3162,7 +3162,7 @@ static void commit_worker(jk_ws_service_
i = status_get_bool(p, JK_STATUS_ARG_LB_STICKY_FORCE,
lb->sticky_session_force, l);
if (i != lb->sticky_session_force) {
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting 'sticky_session_force' for lb
worker '%s' to '%i'",
+ "Status worker '%s' setting 'sticky_session_force' for lb
worker '%s' to '%d'",
w->name, name, i);
lb->sticky_session_force = i;
sync_needed = JK_TRUE;
@@ -3209,11 +3209,11 @@ static int set_int_if_changed(status_end
if (i != *param && i >= min && i <= max) {
if (lb_name)
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting '%s' for sub worker '%s' of lb
worker '%s' to '%i'",
+ "Status worker '%s' setting '%s' for sub worker '%s' of lb
worker '%s' to '%d'",
w->name, att, name, lb_name, i);
else
jk_log(l, JK_LOG_INFO,
- "Status worker '%s' setting '%s' for ajp worker '%s' to
'%i'",
+ "Status worker '%s' setting '%s' for ajp worker '%s' to
'%d'",
w->name, att, name, i);
*param = i;
return JK_TRUE;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
