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 ChangesPath
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.c10 Nov 2004 15:17:02 - 1.11
+++ jk_ajp13.c10 Nov 2004 16:36:48 - 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 - 1.17
+++ jk_ajp13_worker.c 10 Nov 2004 16:36:48 - 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 -29jakarta-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.c10 Nov 2004 15:47:56 - 1.21
+++ jk_ajp14.c10 Nov 2004 16:36:48 - 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
