mturk 2004/11/10 08:36:48
Modified: jk/native/common jk_ajp13.c jk_ajp13_worker.c jk_ajp14.c
jk_ajp14.h jk_ajp_common.h jk_connect.c jk_global.h
jk_lb_worker.c jk_logger.h jk_uri_worker_map.c
jk_util.h jk_worker.c Makefile.in
Log:
Untabify the sources
Revision Changes Path
1.12 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp13.c
Index: jk_ajp13.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_ajp13.c 10 Nov 2004 15:17:02 -0000 1.11
+++ jk_ajp13.c 10 Nov 2004 16:36:48 -0000 1.12
@@ -43,13 +43,13 @@
jk_log(l, JK_LOG_ERROR,
"Error ajp13_marshal_shutdown_into_msgb - Error appending
shutdown message\n");
#ifdef JK_TRACE
- jk_log(l, JK_LOG_TRACE, "leave 1
ajp13_marshal_shutdown_into_msgb\n");
+ jk_log(l, JK_LOG_TRACE, "leave 1
ajp13_marshal_shutdown_into_msgb\n");
#endif
return JK_FALSE;
}
#ifdef JK_TRACE
- jk_log(l, JK_LOG_TRACE, "leave 2
ajp13_marshal_shutdown_into_msgb\n");
+ jk_log(l, JK_LOG_TRACE, "leave 2
ajp13_marshal_shutdown_into_msgb\n");
#endif
return JK_TRUE;
}
1.18 +11 -11
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_ajp13_worker.c 10 Nov 2004 15:47:56 -0000 1.17
+++ jk_ajp13_worker.c 10 Nov 2004 16:36:48 -0000 1.18
@@ -30,7 +30,7 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
return (ajp_validate(pThis, props, we, l, AJP13_PROTO));
}
@@ -39,14 +39,14 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
return (ajp_init(pThis, props, we, l, AJP13_PROTO));
}
static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
return (ajp_destroy(pThis, l, AJP13_PROTO));
}
@@ -54,7 +54,7 @@
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
jk_endpoint_t **pend, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
return (ajp_get_endpoint(pThis, pend, l, AJP13_PROTO));
}
@@ -63,7 +63,7 @@
{
ajp_worker_t *aw = (ajp_worker_t *) malloc(sizeof(ajp_worker_t));
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (name == NULL || w == NULL) {
jk_log(l, JK_LOG_ERROR, "In ajp13_worker_factory, NULL
parameters\n");
return JK_FALSE;
@@ -77,10 +77,10 @@
aw->name = strdup(name);
- /* Lets core dump for every malloc.
- If we can not allocate few bytes what's the purpose
- to keep anyhow and waste cpr cycles
- */
+ /* Lets core dump for every malloc.
+ If we can not allocate few bytes what's the purpose
+ to keep anyhow and waste cpr cycles
+ */
#if 0
if (!aw->name) {
free(aw);
@@ -105,6 +105,6 @@
aw->logon = NULL; /* No Logon on AJP13 */
*w = &aw->worker;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
1.22 +29 -29 jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c
Index: jk_ajp14.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_ajp14.c 10 Nov 2004 15:47:56 -0000 1.21
+++ jk_ajp14.c 10 Nov 2004 16:36:48 -0000 1.22
@@ -34,13 +34,13 @@
void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
jk_md5((const unsigned char *)s->entropy,
(const unsigned char *)s->secret_key, s->computed_key);
jk_log(l, JK_LOG_DEBUG, "Into ajp14_compute_md5 (%s/%s) -> (%s)\n",
s->entropy, s->secret_key, s->computed_key);
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
}
@@ -56,7 +56,7 @@
int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -81,7 +81,7 @@
return JK_FALSE;
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -98,7 +98,7 @@
int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (jk_b_get_bytes
(msg, (unsigned char *)s->entropy, AJP14_ENTROPY_SEED_LEN) < 0) {
@@ -108,7 +108,7 @@
}
s->entropy[AJP14_ENTROPY_SEED_LEN] = 0; /* Just to have a CString */
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -124,7 +124,7 @@
int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
jk_login_service_t *s, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -146,7 +146,7 @@
return JK_FALSE;
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -166,7 +166,7 @@
unsigned long nego;
char *sname;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
nego = jk_b_get_long(msg);
@@ -195,7 +195,7 @@
return JK_FALSE;
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -213,7 +213,7 @@
{
unsigned long status;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
status = jk_b_get_long(msg);
@@ -225,7 +225,7 @@
jk_log(l, JK_LOG_INFO, "Can't Log with servlet engine - code %08lx",
status);
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -243,9 +243,9 @@
jk_login_service_t *s, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
- /* To be on the safe side */
+ /* To be on the safe side */
jk_b_reset(msg);
/*
@@ -265,7 +265,7 @@
return JK_FALSE;
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -281,7 +281,7 @@
{
unsigned long status;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
status = jk_b_get_long(msg);
if (status == 0xFFFFFFFF) {
@@ -292,7 +292,7 @@
jk_log(l, JK_LOG_INFO, "Can't shutdown servlet engine - code %08lx",
status);
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -308,7 +308,7 @@
int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
jk_msg_buf_t *unk, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -335,7 +335,7 @@
return JK_FALSE;
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -351,7 +351,7 @@
int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
char *virtual, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -371,7 +371,7 @@
return JK_FALSE;
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -396,7 +396,7 @@
vname = (char *)jk_b_get_string(msg);
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
jk_log(l, JK_LOG_DEBUG,
"ajp14_unmarshal_context_info - get virtual %s for virtual %s\n",
vname, c->virtual);
@@ -473,7 +473,7 @@
}
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -497,7 +497,7 @@
jk_context_item_t *ci;
int i;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -562,7 +562,7 @@
return JK_FALSE;
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -585,7 +585,7 @@
char *cname;
jk_context_item_t *ci;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
/* get virtual name */
vname = (char *)jk_b_get_string(msg);
@@ -633,7 +633,7 @@
cname, ci->status);
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -649,6 +649,6 @@
int ajp14_unmarshal_context_update_cmd(jk_msg_buf_t *msg,
jk_context_t *c, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
return (ajp14_unmarshal_context_state_reply(msg, c, l));
}
1.15 +28 -28 jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h
Index: jk_ajp14.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_ajp14.h 8 Nov 2004 13:25:57 -0000 1.14
+++ jk_ajp14.h 10 Nov 2004 16:36:48 -0000 1.15
@@ -30,94 +30,94 @@
{
#endif /* __cplusplus */
-#define AJP14_PROTO 14
+#define AJP14_PROTO 14
#define AJP14_WS_HEADER 0x1235
#define AJP14_SW_HEADER 0x1235 /* AJP14 use now the same
header in both directions */
-#define AJP14_DEF_HOST ("localhost")
-#define AJP14_DEF_PORT (8011)
+#define AJP14_DEF_HOST ("localhost")
+#define AJP14_DEF_PORT (8011)
#define AJP14_READ_BUF_SIZE (8*1024)
#define AJP14_DEF_RETRY_ATTEMPTS (1)
-#define AJP14_DEF_CACHE_SZ (1)
-#define AJP14_MAX_SEND_BODY_SZ (DEF_BUFFER_SZ - 6)
-#define AJP14_HEADER_LEN (4)
-#define AJP14_HEADER_SZ_LEN (2)
+#define AJP14_DEF_CACHE_SZ (1)
+#define AJP14_MAX_SEND_BODY_SZ (DEF_BUFFER_SZ - 6)
+#define AJP14_HEADER_LEN (4)
+#define AJP14_HEADER_SZ_LEN (2)
/*
* Initial Login Phase (web server -> servlet engine)
*/
-#define AJP14_LOGINIT_CMD (unsigned char)0x10
+#define AJP14_LOGINIT_CMD (unsigned char)0x10
/*
* Second Login Phase (servlet engine -> web server), md5 seed is received
*/
-#define AJP14_LOGSEED_CMD (unsigned char)0x11
+#define AJP14_LOGSEED_CMD (unsigned char)0x11
/*
* Third Login Phase (web server -> servlet engine), md5 of seed + secret is
sent
*/
-#define AJP14_LOGCOMP_CMD (unsigned char)0x12
+#define AJP14_LOGCOMP_CMD (unsigned char)0x12
/*
* Login Accepted (servlet engine -> web server)
*/
-#define AJP14_LOGOK_CMD (unsigned char)0x13
+#define AJP14_LOGOK_CMD (unsigned char)0x13
/*
* Login Rejected (servlet engine -> web server), will be logged
*/
-#define AJP14_LOGNOK_CMD (unsigned char)0x14
+#define AJP14_LOGNOK_CMD (unsigned char)0x14
/*
* Context Query (web server -> servlet engine), which URI are handled by
servlet engine ?
*/
-#define AJP14_CONTEXT_QRY_CMD (unsigned char)0x15
+#define AJP14_CONTEXT_QRY_CMD (unsigned char)0x15
/*
* Context Info (servlet engine -> web server), URI handled response
*/
-#define AJP14_CONTEXT_INFO_CMD (unsigned char)0x16
+#define AJP14_CONTEXT_INFO_CMD (unsigned char)0x16
/*
* Context Update (servlet engine -> web server), status of context changed
*/
-#define AJP14_CONTEXT_UPDATE_CMD (unsigned char)0x17
+#define AJP14_CONTEXT_UPDATE_CMD (unsigned char)0x17
/*
* Servlet Engine Status (web server -> servlet engine), what's the status
of the servlet engine ?
*/
-#define AJP14_STATUS_CMD (unsigned char)0x18
+#define AJP14_STATUS_CMD (unsigned char)0x18
/*
* Secure Shutdown command (web server -> servlet engine), please servlet
stop yourself.
*/
-#define AJP14_SHUTDOWN_CMD (unsigned char)0x19
+#define AJP14_SHUTDOWN_CMD (unsigned char)0x19
/*
* Secure Shutdown command Accepted (servlet engine -> web server)
*/
-#define AJP14_SHUTOK_CMD (unsigned char)0x1A
+#define AJP14_SHUTOK_CMD (unsigned char)0x1A
/*
* Secure Shutdown Rejected (servlet engine -> web server)
*/
-#define AJP14_SHUTNOK_CMD (unsigned char)0x1B
+#define AJP14_SHUTNOK_CMD (unsigned char)0x1B
/*
* Context Status (web server -> servlet engine), what's the status of the
context ?
*/
-#define AJP14_CONTEXT_STATE_CMD (unsigned char)0x1C
+#define AJP14_CONTEXT_STATE_CMD (unsigned char)0x1C
/*
* Context Status Reply (servlet engine -> web server), status of context
*/
-#define AJP14_CONTEXT_STATE_REP_CMD (unsigned char)0x1D
+#define AJP14_CONTEXT_STATE_REP_CMD (unsigned char)0x1D
/*
* Unknown Packet Reply (web server <-> servlet engine), when a packet
couldn't be decoded
*/
-#define AJP14_UNKNOW_PACKET_CMD (unsigned char)0x1E
+#define AJP14_UNKNOW_PACKET_CMD (unsigned char)0x1E
/*
@@ -187,9 +187,9 @@
/*
* Some failure codes
*/
-#define AJP14_BAD_KEY_ERR 0xFFFFFFFF
-#define AJP14_ENGINE_DOWN_ERR 0xFFFFFFFE
-#define AJP14_RETRY_LATER_ERR 0xFFFFFFFD
+#define AJP14_BAD_KEY_ERR 0xFFFFFFFF
+#define AJP14_ENGINE_DOWN_ERR 0xFFFFFFFE
+#define AJP14_RETRY_LATER_ERR 0xFFFFFFFD
#define AJP14_SHUT_AUTHOR_FAILED_ERR 0xFFFFFFFC
/*
@@ -202,8 +202,8 @@
/*
* Misc defines
*/
-#define AJP14_ENTROPY_SEED_LEN 32 /* we're using MD5 =>
32 chars */
-#define AJP14_COMPUTED_KEY_LEN 32 /* we're using MD5 also
*/
+#define AJP14_ENTROPY_SEED_LEN 32 /* we're using MD5 => 32 chars */
+#define AJP14_COMPUTED_KEY_LEN 32 /* we're using MD5 also */
/*
* The login structure
1.26 +3 -3
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h
Index: jk_ajp_common.h
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_ajp_common.h 8 Nov 2004 13:27:52 -0000 1.25
+++ jk_ajp_common.h 10 Nov 2004 16:36:48 -0000 1.26
@@ -192,10 +192,10 @@
#define AJP_DEF_CONNECT_TIMEOUT (0) /* NO CONNECTION TIMEOUT => NO
CPING/CPONG */
#define AJP_DEF_REPLY_TIMEOUT (0) /* NO REPLY TIMEOUT
*/
#define AJP_DEF_PREPOST_TIMEOUT (0) /* NO PREPOST TIMEOUT => NO
CPING/CPONG */
-#define AJP_DEF_RECOVERY_OPTS (0) /* NO RECOVERY / NO */
+#define AJP_DEF_RECOVERY_OPTS (0) /* NO RECOVERY / NO */
#define AJP_DEF_SOCKET_TIMEOUT (-1) /* No timeout */
-#define RECOVER_ABORT_IF_TCGETREQUEST 0x0001 /* DONT RECOVER IF
TOMCAT FAIL AFTER RECEIVING REQUEST */
+#define RECOVER_ABORT_IF_TCGETREQUEST 0x0001 /* DONT RECOVER IF TOMCAT
FAIL AFTER RECEIVING REQUEST */
#define RECOVER_ABORT_IF_TCSENDHEADER 0x0002 /* DONT RECOVER IF TOMCAT
FAIL AFTER SENDING HEADERS */
1.30 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_connect.c 10 Nov 2004 16:28:31 -0000 1.29
+++ jk_connect.c 10 Nov 2004 16:36:48 -0000 1.30
@@ -140,7 +140,7 @@
char buf[32];
int sock;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock >= 0) {
@@ -234,7 +234,7 @@
"jk_open_socket, socket() failed errno = %d\n", errno);
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return sock;
}
1.38 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- jk_global.h 10 Nov 2004 14:35:41 -0000 1.37
+++ jk_global.h 10 Nov 2004 16:36:48 -0000 1.38
@@ -143,9 +143,9 @@
* RECO STATUS
*/
-#define RECO_NONE 0x00
-#define RECO_INITED 0x01
-#define RECO_FILLED 0x02
+#define RECO_NONE 0x00
+#define RECO_INITED 0x01
+#define RECO_FILLED 0x02
/*
* JK options
1.27 +18 -18 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_lb_worker.c 10 Nov 2004 16:28:31 -0000 1.26
+++ jk_lb_worker.c 10 Nov 2004 16:36:48 -0000 1.27
@@ -274,7 +274,7 @@
jk_ws_service_t *s,
jk_logger_t *l, int *is_recoverable_error)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (e && e->endpoint_private && s && is_recoverable_error) {
lb_endpoint_t *p = e->endpoint_private;
@@ -316,7 +316,7 @@
rec->in_error_state = JK_FALSE;
rec->in_recovering = JK_FALSE;
rec->error_time = 0;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
}
@@ -345,7 +345,7 @@
* another worker... Lets try to do that.
*/
jk_log(l, JK_LOG_DEBUG,
- __FUNCTION__ "::recoverable error...
will try to recover on other host\n");
+ __FUNCTION__ "::recoverable error... will try to
recover on other host\n");
}
else {
/* NULL record, no more workers left ... */
@@ -363,7 +363,7 @@
static int JK_METHOD done(jk_endpoint_t **e, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (e && *e && (*e)->endpoint_private) {
lb_endpoint_t *p = (*e)->endpoint_private;
@@ -374,11 +374,11 @@
free(p);
*e = NULL;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
- JK_LOG_NULL_PARAMS(l);
+ JK_LOG_NULL_PARAMS(l);
return JK_FALSE;
}
@@ -387,7 +387,7 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (pThis && pThis->worker_private) {
lb_worker_t *p = pThis->worker_private;
@@ -477,13 +477,13 @@
"local_worker_only: %s\n",
(p->local_worker_only ? "true" : "false"));
p->num_of_workers = num_of_workers;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
}
}
- JK_LOG_NULL_PARAMS(l);
+ JK_LOG_NULL_PARAMS(l);
return JK_FALSE;
}
@@ -498,7 +498,7 @@
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
jk_endpoint_t **pend, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (pThis && pThis->worker_private && pend) {
lb_endpoint_t *p = (lb_endpoint_t *) malloc(sizeof(lb_endpoint_t));
@@ -509,11 +509,11 @@
p->endpoint.done = done;
*pend = &p->endpoint;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
else {
- JK_LOG_NULL_PARAMS(l);
+ JK_LOG_NULL_PARAMS(l);
}
return JK_FALSE;
@@ -521,7 +521,7 @@
static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (pThis && *pThis && (*pThis)->worker_private) {
lb_worker_t *private_data = (*pThis)->worker_private;
@@ -531,7 +531,7 @@
jk_close_pool(&private_data->p);
free(private_data);
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -542,7 +542,7 @@
int JK_METHOD lb_worker_factory(jk_worker_t **w,
const char *name, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (NULL != name && NULL != w) {
lb_worker_t *private_data =
@@ -563,11 +563,11 @@
private_data->worker.destroy = destroy;
*w = &private_data->worker;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
else {
- JK_LOG_NULL_PARAMS(l);
+ JK_LOG_NULL_PARAMS(l);
}
return JK_FALSE;
1.13 +6 -6 jakarta-tomcat-connectors/jk/native/common/jk_logger.h
Index: jk_logger.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_logger.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_logger.h 10 Nov 2004 16:28:31 -0000 1.12
+++ jk_logger.h 10 Nov 2004 16:36:48 -0000 1.13
@@ -59,7 +59,7 @@
#define JK_LOG_EMERG_LEVEL 5
#define JK_LOG_REQUEST_LEVEL 6
-#define JK_LOG_TRACE_WERB "trace"
+#define JK_LOG_TRACE_WERB "trace"
#define JK_LOG_DEBUG_VERB "debug"
#define JK_LOG_INFO_VERB "info"
#define JK_LOG_WARNING_VERB "warn"
@@ -77,11 +77,11 @@
/* Debug level is compile time only
*/
#if defined (DEBUG) || (_DEBUG)
-#define JK_TRACE 1
+#define JK_TRACE 1
#define JK_TRACE_ENTER(l) jk_log((l), JK_LOG_TRACE, "enter " __FUNCTION__
"\n")
#define JK_TRACE_EXIT(l) jk_log((l), JK_LOG_TRACE, "exit " __FUNCTION__
"\n")
#else
-#define JK_TRACE 0
+#define JK_TRACE 0
#define JK_TRACE_ENTER(l)
#define JK_TRACE_EXIT(l)
#endif
@@ -92,5 +92,5 @@
#ifdef __cplusplus
}
-#endif /* __cplusplus */
-#endif /* JK_LOGGER_H */
+#endif /* __cplusplus */
+#endif /* JK_LOGGER_H */
1.26 +12 -12
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
Index: jk_uri_worker_map.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jk_uri_worker_map.c 10 Nov 2004 16:28:31 -0000 1.25
+++ jk_uri_worker_map.c 10 Nov 2004 16:36:48 -0000 1.26
@@ -133,7 +133,7 @@
int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map,
jk_map_t *init_data, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (init_data && uw_map) {
return uri_worker_map_open(*uw_map =
@@ -150,13 +150,13 @@
int uri_worker_map_free(jk_uri_worker_map_t **uw_map, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (uw_map && *uw_map) {
uri_worker_map_close(*uw_map, l);
free(*uw_map);
*uw_map = NULL;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
else
@@ -205,7 +205,7 @@
char *uri;
char *worker;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (uri_worker_map_realloc(uw_map) == JK_FALSE)
return JK_FALSE;
@@ -338,7 +338,7 @@
uw_map->maps[uw_map->size] = uwr;
uw_map->size++;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -347,7 +347,7 @@
{
int rc = JK_TRUE;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
uw_map->size = 0;
uw_map->capacity = 0;
@@ -401,7 +401,7 @@
}
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return rc;
}
@@ -419,12 +419,12 @@
int uri_worker_map_close(jk_uri_worker_map_t *uw_map, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (uw_map) {
jk_close_pool(&uw_map->p);
jk_close_pool(&uw_map->tp);
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -463,7 +463,7 @@
char *map_uri_to_worker(jk_uri_worker_map_t *uw_map,
char *uri, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (uw_map && uri && '/' == uri[0]) {
unsigned i;
@@ -597,6 +597,6 @@
__FUNCTION__ "::map_uri_to_worker, wrong parameters\n");
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return NULL;
}
1.19 +6 -6 jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_util.h 8 Nov 2004 13:34:11 -0000 1.18
+++ jk_util.h 10 Nov 2004 16:36:48 -0000 1.19
@@ -127,11 +127,11 @@
void jk_init_ws_service(jk_ws_service_t *s);
-#define TC32_BRIDGE_TYPE 32
-#define TC33_BRIDGE_TYPE 33
-#define TC40_BRIDGE_TYPE 40
-#define TC41_BRIDGE_TYPE 41
-#define TC50_BRIDGE_TYPE 50
+#define TC32_BRIDGE_TYPE 32
+#define TC33_BRIDGE_TYPE 33
+#define TC40_BRIDGE_TYPE 40
+#define TC41_BRIDGE_TYPE 41
+#define TC50_BRIDGE_TYPE 50
#ifdef __cplusplus
extern "C"
1.21 +13 -13 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_worker.c 10 Nov 2004 16:28:31 -0000 1.20
+++ jk_worker.c 10 Nov 2004 16:36:48 -0000 1.21
@@ -40,7 +40,7 @@
char **worker_list = NULL;
unsigned num_of_workers = 0;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (!jk_map_alloc(&worker_map)) {
return JK_FALSE;
@@ -57,23 +57,23 @@
we->num_of_workers = num_of_workers;
we->first_worker = worker_list[0];
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
void wc_close(jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
close_workers(l);
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
}
jk_worker_t *wc_get_worker_for_name(const char *name, jk_logger_t *l)
{
jk_worker_t *rc;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (!name) {
jk_log(l, JK_LOG_ERROR, "wc_get_worker_for_name NULL name\n");
}
@@ -84,7 +84,7 @@
jk_log(l, JK_LOG_DEBUG, "wc_get_worker_for_name, done %s a worker\n",
rc ? "found" : "did not find");
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return rc;
}
@@ -93,7 +93,7 @@
jk_map_t *init_data,
jk_worker_t **rc, jk_worker_env_t *we, jk_logger_t *l)
{
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (rc) {
char *type = jk_get_worker_type(init_data, name);
@@ -136,7 +136,7 @@
}
*rc = w;
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -148,7 +148,7 @@
{
int sz = jk_map_size(worker_map);
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
if (sz > 0) {
int i;
@@ -162,7 +162,7 @@
}
}
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
jk_map_free(&worker_map);
}
@@ -173,7 +173,7 @@
{
unsigned i;
- JK_TRACE_ENTER(l);
+ JK_TRACE_ENTER(l);
for (i = 0; i < num_of_workers; i++) {
jk_worker_t *w = NULL;
@@ -203,7 +203,7 @@
}
}
- JK_TRACE_EXIT(l);
+ JK_TRACE_EXIT(l);
return JK_TRUE;
}
1.11 +1 -1 jakarta-tomcat-connectors/jk/native/common/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 11 Dec 2002 10:38:52 -0000 1.10
+++ Makefile.in 10 Nov 2004 16:36:48 -0000 1.11
@@ -28,4 +28,4 @@
install:
clean:
- rm -f *.o *.slo *.lo
+ rm -f *.o *.slo *.lo
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
