nacho 02/04/12 14:49:03
Modified: jk/native2/common jk_channel_jni.c jk_channel_socket.c
jk_config.c jk_endpoint.c jk_env.c
jk_handler_logon.c jk_handler_response.c
jk_logger_file.c jk_uriEnv.c jk_uriMap.c
jk_vm_default.c jk_worker_ajp13.c jk_workerEnv.c
jk/native2/include jk_env.h jk_global.h jk_handler.h
jk_logger.h
Log:
Fixes for Win32 compatibility, 72 warnings left
Revision Changes Path
1.7 +6 -6 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_channel_jni.c 11 Apr 2002 19:30:23 -0000 1.6
+++ jk_channel_jni.c 12 Apr 2002 21:49:03 -0000 1.7
@@ -277,7 +277,7 @@
jk_endpoint_t *endpoint,
jk_msg_t *msg)
{
- int sd;
+// int sd;
int sent=0;
char *b;
int len;
@@ -370,10 +370,10 @@
jk_endpoint_t *endpoint,
jk_msg_t *msg)
{
- jbyte *nbuf;
- jbyteArray jbuf;
- int jlen;
- jboolean iscommit;
+// jbyte *nbuf;
+// jbyteArray jbuf;
+// int jlen;
+// jboolean iscommit;
jk_channel_jni_private_t *jniCh=_this->_privatePtr;
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -406,7 +406,7 @@
static int jk2_channel_jni_processMsg(jk_env_t *env, jk_endpoint_t *e,
jk_ws_service_t *r)
{
- int code;
+// int code;
jk_handler_t *handler;
int rc;
jk_handler_t **handlerTable=e->worker->workerEnv->handlerTable;
1.19 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
Index: jk_channel_socket.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_channel_socket.c 11 Apr 2002 19:30:23 -0000 1.18
+++ jk_channel_socket.c 12 Apr 2002 21:49:03 -0000 1.19
@@ -117,7 +117,7 @@
static int JK_METHOD jk2_channel_socket_close(jk_env_t *env, jk_channel_t *ch,
jk_endpoint_t *endpoint);
-static int jk2_channel_socket_setAttribute(jk_env_t *env,
+static int JK_METHOD jk2_channel_socket_setAttribute(jk_env_t *env,
jk_bean_t *mbean,
char *name, void *valueP)
{
@@ -248,7 +248,7 @@
jk_channel_t *ch,
jk_endpoint_t *endpoint)
{
- int err;
+// int err;
jk_channel_socket_private_t *socketInfo=
(jk_channel_socket_private_t *)(ch->_privatePtr);
@@ -261,7 +261,7 @@
sock = socket(AF_INET, SOCK_STREAM, 0);
if(sock < 0) {
#ifdef WIN32
- if(SOCKET_ERROR == ret) {
+ if(INVALID_SOCKET == sock) {
errno = WSAGetLastError() - WSABASEERR;
}
#endif /* WIN32 */
1.10 +10 -10 jakarta-tomcat-connectors/jk/native2/common/jk_config.c
Index: jk_config.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_config.c 11 Apr 2002 19:32:04 -0000 1.9
+++ jk_config.c 12 Apr 2002 21:49:03 -0000 1.10
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: General purpose config object *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***************************************************************************/
#include "jk_global.h"
@@ -140,7 +140,7 @@
char *workerFile)
{
FILE *fp;
- char buf[LENGTH_OF_LINE + 1];
+// char buf[LENGTH_OF_LINE + 1];
int i,j;
fp= fopen(workerFile, "w");
@@ -201,16 +201,16 @@
jk_bean_t *w = NULL;
char *type=NULL;
char *dot=0;
- int i;
- char **comp;
- int nrComp;
+// int i;
+// char **comp;
+// int nrComp;
char *lastDot;
char *lastDot1;
propertyString=cfg->pool->pstrdup( env, cfg->pool, propertyString );
- lastDot= rindex( propertyString, (int)'.' );
- lastDot1= rindex( propertyString, (int)':' );
+ lastDot= strrchr( propertyString, (int)'.' );
+ lastDot1= strrchr( propertyString, (int)':' );
if( lastDot1==NULL )
lastDot1=lastDot;
@@ -582,7 +582,7 @@
FILE *fp;
char buf[LENGTH_OF_LINE + 1];
char *prp;
- char *v;
+// char *v;
if(m==NULL || f==NULL )
return JK_FALSE;
@@ -769,7 +769,7 @@
/** Set a property for this config object
*/
-static int jk2_config_setAttribute( struct jk_env *env, struct jk_bean *mbean,
+static int JK_METHOD jk2_config_setAttribute( struct jk_env *env, struct jk_bean
*mbean,
char *name, void *valueP)
{
jk_config_t *cfg=mbean->object;
@@ -816,7 +816,7 @@
return strlen(s);
}
-int jk2_config_factory( jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_config_factory( jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
const char *type, const char *name)
{
1.7 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c
Index: jk_endpoint.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_endpoint.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_endpoint.c 23 Mar 2002 17:17:30 -0000 1.6
+++ jk_endpoint.c 12 Apr 2002 21:49:03 -0000 1.7
@@ -82,7 +82,7 @@
* avg_time, max_time
*
*/
-static void *jk2_endpoint_getAttribute(jk_env_t *env, jk_bean_t *bean, char *name )
{
+static void * JK_METHOD jk2_endpoint_getAttribute(jk_env_t *env, jk_bean_t *bean,
char *name ) {
return NULL;
}
1.18 +9 -9 jakarta-tomcat-connectors/jk/native2/common/jk_env.c
Index: jk_env.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_env.c 11 Apr 2002 19:32:32 -0000 1.17
+++ jk_env.c 12 Apr 2002 21:49:03 -0000 1.18
@@ -136,7 +136,7 @@
static jk_bean_t *jk2_env_createBean( jk_env_t *env, jk_pool_t *pool, char *objName
)
{
char *type=NULL;
- void *obj;
+// void *obj;
char *localName;
localName=strchr( objName, ':' );
@@ -245,7 +245,7 @@
/** Define an alias, for simpler config / less typing
*/
-static void jk2_env_alias(jk_env_t *env, char *name, char *alias)
+static void JK_METHOD jk2_env_alias(jk_env_t *env, const char *name, const char
*alias)
{
jk_bean_t *jkb=env->getBean(env, name);
@@ -264,7 +264,7 @@
/** Get the object by name. Returns the real object, not the wrapper
*/
-static void *jk2_env_getByName(jk_env_t *env, char *name)
+static void * JK_METHOD jk2_env_getByName(jk_env_t *env, const char *name)
{
jk_bean_t *result=env->getBean( env, name );
@@ -273,7 +273,7 @@
return result->object;
}
-static void *jk2_env_getByName2(jk_env_t *env, char *type, char *localName)
+static void* JK_METHOD jk2_env_getByName2(jk_env_t *env, const char *type, const
char *localName)
{
jk_bean_t *result = env->getBean2( env, type, localName);
if( result==NULL ) return NULL;
@@ -282,7 +282,7 @@
/** Get the wrapper for the named object
*/
-static jk_bean_t JK_METHOD *jk2_env_getBean(jk_env_t *env, char *name)
+static jk_bean_t* JK_METHOD jk2_env_getBean(jk_env_t *env, const char *name)
{
if( name==NULL ) {
env->l->jkLog(env, env->l, JK_LOG_ERROR,
@@ -293,7 +293,7 @@
return (jk_bean_t *)env->_objects->get( env, env->_objects, name );
}
-static jk_bean_t JK_METHOD *jk2_env_getBean2(jk_env_t *env, char *type, char
*localName)
+static jk_bean_t* JK_METHOD jk2_env_getBean2(jk_env_t *env, const char *type, const
char *localName)
{
char *name;
if( type==NULL || localName==NULL ) {
@@ -334,7 +334,7 @@
const char *fmt, ... )
{
va_list args;
- char *buf;
+// char *buf;
va_start(args, fmt);
env->l->jkVLog(env, env->l, file, line, JK_LOG_ERROR_LEVEL, fmt, args );
@@ -346,7 +346,7 @@
* in the stack trace
* XXX Not implemented/not used
*/
-static JK_METHOD void jkReThrow( jk_env_t *env,
+static void JK_METHOD jkReThrow( jk_env_t *env,
const char *file, int line )
{
/* Nothing yet. It should record the file/line for stack trace */
@@ -354,7 +354,7 @@
/* Last exception that occured
*/
-static JK_METHOD jk_exception_t *jk_env_jkException( jk_env_t *env )
+static jk_exception_t* JK_METHOD jk_env_jkException( jk_env_t *env )
{
return env->lastException;
}
1.13 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c
Index: jk_handler_logon.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_logon.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_handler_logon.c 18 Mar 2002 18:37:58 -0000 1.12
+++ jk_handler_logon.c 12 Apr 2002 21:49:03 -0000 1.13
@@ -58,7 +58,7 @@
/**
* Description: AJP14 Login handler
* Author: Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.12 $
+ * Version: $Revision: 1.13 $
*/
#include "jk_global.h"
@@ -119,7 +119,7 @@
* String serverName
*
*/
-static int jk2_handler_login(jk_env_t *env, jk_msg_t *msg,
+static int JK_METHOD jk2_handler_login(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s, jk_endpoint_t *ae)
{
int rc;
@@ -182,12 +182,12 @@
* +--------------------+------------------------+---------------------------
*
*/
-static int jk2_handler_logok(jk_env_t *env, jk_msg_t *msg,
+static int JK_METHOD jk2_handler_logok(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s, jk_endpoint_t *ae )
{
unsigned long nego;
char *sname;
- int rc;
+// int rc;
nego = msg->getLong(env, msg);
@@ -229,7 +229,7 @@
* +---------------------+-----------------------+
*
*/
-static int jk2_handler_lognok(jk_env_t *env, jk_msg_t *msg,
+static int JK_METHOD jk2_handler_lognok(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s, jk_endpoint_t *ae )
{
unsigned long status;
1.15 +5 -5
jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c
Index: jk_handler_response.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_handler_response.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jk_handler_response.c 18 Mar 2002 18:37:58 -0000 1.14
+++ jk_handler_response.c 12 Apr 2002 21:49:03 -0000 1.15
@@ -111,7 +111,7 @@
body length*(var binary)
*/
-static int jk2_handler_startResponse(jk_env_t *env, jk_msg_t *msg,
+static int JK_METHOD jk2_handler_startResponse(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *s, jk_endpoint_t *ae )
{
int err=JK_FALSE;
@@ -197,7 +197,7 @@
/** SEND_BODY_CHUNK handler
*/
-static int jk2_handler_sendChunk(jk_env_t *env, jk_msg_t *msg,
+static int JK_METHOD jk2_handler_sendChunk(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r, jk_endpoint_t *ae)
{
int err;
@@ -215,7 +215,7 @@
return JK_HANDLER_OK;
}
-static int jk2_handler_endResponse(jk_env_t *env, jk_msg_t *msg,
+static int JK_METHOD jk2_handler_endResponse(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r,jk_endpoint_t *ae)
{
ae->reuse = (int)msg->getByte(env, msg);
@@ -231,7 +231,7 @@
/** SEND_BODY_CHUNK handler
*/
-static int jk2_handler_getChunk(jk_env_t *env, jk_msg_t *msg,
+static int JK_METHOD jk2_handler_getChunk(jk_env_t *env, jk_msg_t *msg,
jk_ws_service_t *r, jk_endpoint_t *ae)
{
int len = msg->getInt(env, msg);
@@ -299,7 +299,7 @@
jk_bean_t *result,
const char *type, const char *name)
{
- jk_map_t *map;
+// jk_map_t *map;
jk_handler_t *h;
h=(jk_handler_t *)pool->calloc( env, pool, sizeof( jk_handler_t));
1.18 +7 -7 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- jk_logger_file.c 11 Apr 2002 20:23:41 -0000 1.17
+++ jk_logger_file.c 12 Apr 2002 21:49:03 -0000 1.18
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.17 $ *
+ * Version: $Revision: 1.18 $ *
***************************************************************************/
#include "jk_env.h"
@@ -97,7 +97,7 @@
strftime(str, len, jk2_logger_file_logFmt, tms);
}
-static int jk2_logger_file_log(jk_env_t *env,jk_logger_t *l,
+static int JK_METHOD jk2_logger_file_log(jk_env_t *env,jk_logger_t *l,
int level,
const char *what)
{
@@ -143,7 +143,7 @@
}
-static int jk2_logger_file_init(jk_env_t *env,jk_logger_t *_this )
+static int JK_METHOD jk2_logger_file_init(jk_env_t *env,jk_logger_t *_this )
{
FILE *oldF=(FILE *)_this->logger_private;
FILE *f=NULL;
@@ -209,11 +209,11 @@
}
-static int jk2_logger_file_jkVLog(jk_env_t *env, jk_logger_t *l,
+static int JK_METHOD jk2_logger_file_jkVLog(jk_env_t *env, jk_logger_t *l,
const char *file,
int line,
int level,
- char *fmt,
+ const char *fmt,
va_list args)
{
int rc = 0;
@@ -242,7 +242,7 @@
}
#ifdef WIN32
- set_time_str(buf, HUGE_BUFFER_SIZE);
+ jk2_logger_file_setTimeStr(env,buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
if( level >= JK_LOG_DEBUG_LEVEL )
used += _snprintf(&buf[used], HUGE_BUFFER_SIZE, " [%s (%d)]: ", f,
line);
@@ -300,7 +300,7 @@
return rc;
}
-int jk2_logger_file_factory(jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_logger_file_factory(jk_env_t *env, jk_pool_t *pool,
jk_bean_t *result,
const char *type, const char *name)
{
1.8 +6 -6 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
Index: jk_uriEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_uriEnv.c 27 Mar 2002 18:58:57 -0000 1.7
+++ jk_uriEnv.c 12 Apr 2002 21:49:03 -0000 1.8
@@ -107,7 +107,7 @@
return JK_TRUE;
}
-static void *jk2_uriEnv_getAttribute(jk_env_t *env, jk_bean_t *bean,
+static void * JK_METHOD jk2_uriEnv_getAttribute(jk_env_t *env, jk_bean_t *bean,
char *name )
{
jk_uriEnv_t *uriEnv=(jk_uriEnv_t *)bean->object;
@@ -122,7 +122,7 @@
return NULL;
}
-static int jk2_uriEnv_setProperty(jk_env_t *env,
+static int JK_METHOD jk2_uriEnv_setProperty(jk_env_t *env,
jk_bean_t *mbean,
char *nameParam,
void *valueP)
@@ -163,7 +163,7 @@
static int jk2_uriEnv_init(jk_env_t *env, jk_uriEnv_t *uriEnv)
{
- int err;
+// int err;
char *asterisk;
char *uri=uriEnv->pool->pstrdup( env, uriEnv->pool, uriEnv->uri);
@@ -270,7 +270,7 @@
const char *type, const char *name)
{
jk_pool_t *uriPool;
- int err;
+// int err;
jk_uriEnv_t *uriEnv;
uriPool=(jk_pool_t *)pool->create( env, pool,
@@ -285,8 +285,8 @@
uriEnv->init=jk2_uriEnv_init;
- result->setAttribute=&jk2_uriEnv_setProperty;
- result->getAttribute=&jk2_uriEnv_getAttribute;
+ result->setAttribute=jk2_uriEnv_setProperty;
+ result->getAttribute=jk2_uriEnv_getAttribute;
uriEnv->mbean=result;
result->object=uriEnv;
result->getAttributeInfo=myAttInfo;
1.22 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c
Index: jk_uriMap.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriMap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_uriMap.c 12 Apr 2002 00:04:27 -0000 1.21
+++ jk_uriMap.c 12 Apr 2002 21:49:03 -0000 1.22
@@ -67,7 +67,7 @@
* servlet container.
*
* Author: Gal Shachor <[EMAIL PROTECTED]>
- * Version: $Revision: 1.21 $
+ * Version: $Revision: 1.22 $
*/
#include "jk_pool.h"
@@ -228,7 +228,7 @@
/* uwr->mbean->setAttribute( env, uwr->mbean, "worker", (char *)pworker ); */
-static int jk2_uriMap_setProperty(jk_env_t *env, jk_bean_t *mbean,
+static int JK_METHOD jk2_uriMap_setProperty(jk_env_t *env, jk_bean_t *mbean,
char *name, void *valueP)
{
jk_uriMap_t *_this=mbean->object;
1.7 +1 -1 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
Index: jk_vm_default.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_vm_default.c 18 Mar 2002 18:45:25 -0000 1.6
+++ jk_vm_default.c 12 Apr 2002 21:49:03 -0000 1.7
@@ -696,7 +696,7 @@
return NULL;
}
-static int
+static int JK_METHOD
jk2_jk_vm_setProperty(jk_env_t *env, jk_bean_t *mbean, char *name, void *valueP )
{
jk_vm_t *_this=mbean->object;
1.8 +2 -2 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
Index: jk_worker_ajp13.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_worker_ajp13.c 11 Apr 2002 19:34:55 -0000 1.7
+++ jk_worker_ajp13.c 12 Apr 2002 21:49:03 -0000 1.8
@@ -88,7 +88,7 @@
static char *myAttInfo[]={ "channelName", "route", "errorState", "recovering",
"epCount", NULL };
-static void *jk2_worker_ajp14_getAttribute(jk_env_t *env, jk_bean_t *bean, char
*name ) {
+static void * JK_METHOD jk2_worker_ajp14_getAttribute(jk_env_t *env, jk_bean_t
*bean, char *name ) {
jk_worker_t *worker=(jk_worker_t *)bean->object;
if( strcmp( name, "channelName" )==0 ) {
@@ -122,7 +122,7 @@
/*
* Initialize the worker.
*/
-static int
+static int JK_METHOD
jk2_worker_ajp14_setAttribute(jk_env_t *env, jk_bean_t *mbean,
char *name, void *valueP )
{
1.28 +5 -5 jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c
Index: jk_workerEnv.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_workerEnv.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_workerEnv.c 12 Apr 2002 00:09:17 -0000 1.27
+++ jk_workerEnv.c 12 Apr 2002 21:49:03 -0000 1.28
@@ -59,7 +59,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.27 $ *
+ * Version: $Revision: 1.28 $ *
***************************************************************************/
#include "jk_env.h"
@@ -79,7 +79,7 @@
/* ==================== Setup ==================== */
-static int jk2_workerEnv_setAttribute( struct jk_env *env, struct jk_bean *mbean,
+static int JK_METHOD jk2_workerEnv_setAttribute( struct jk_env *env, struct jk_bean
*mbean,
char *name, void *valueP)
{
jk_workerEnv_t *wEnv=mbean->object;
@@ -279,7 +279,7 @@
}
}
-static void jk2_workerEnv_registerHandler(jk_env_t *env, jk_workerEnv_t *wEnv,
+static int jk2_workerEnv_registerHandler(jk_env_t *env, jk_workerEnv_t *wEnv,
jk_handler_t *handler)
{
jk2_workerEnv_checkSpace( env, wEnv->pool,
@@ -458,7 +458,7 @@
return JK_FALSE;
default:
/* Unknown status */
- /* return JK_FALSE; */
+ break;
}
}
return JK_FALSE;
@@ -558,7 +558,7 @@
result->object=wEnv;
wEnv->mbean=result;
- result->setAttribute=&jk2_workerEnv_setAttribute;
+ result->setAttribute=jk2_workerEnv_setAttribute;
wEnv->pool=pool;
1.12 +8 -8 jakarta-tomcat-connectors/jk/native2/include/jk_env.h
Index: jk_env.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_env.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_env.h 26 Mar 2002 02:55:15 -0000 1.11
+++ jk_env.h 12 Apr 2002 21:49:03 -0000 1.12
@@ -183,10 +183,10 @@
* workers.properties doc.
* XXX Implement run-time change in the status/ctl workers.
*/
- int (*setAttribute)(struct jk_env *env, struct jk_bean *bean,
+ int ( JK_METHOD *setAttribute)(struct jk_env *env, struct jk_bean *bean,
char *name, void *value );
- void *(*getAttribute)(struct jk_env *env, struct jk_bean *bean, char *name );
+ void * ( JK_METHOD *getAttribute)(struct jk_env *env, struct jk_bean *bean,
char *name );
/* getBeanInfo() */
@@ -218,11 +218,11 @@
* The env will store the exception status and the tmp pool - the pool will
* be recycled when the env is released, use it only for tmp things.
*/
- struct jk_env *(*getEnv)(struct jk_env *parent);
+ struct jk_env *(JK_METHOD *getEnv)(struct jk_env *parent);
/** Release the env instance. The tmpPool will be recycled.
*/
- int (*releaseEnv)(struct jk_env *parent, struct jk_env *chld);
+ int (JK_METHOD *releaseEnv)(struct jk_env *parent, struct jk_env *chld);
/* -------------------- Exceptions -------------------- */
@@ -273,7 +273,7 @@
/** Register an alias for a name ( like the local part, etc ), for simpler
config.
*/
- void (JK_METHOD *alias)(struct jk_env *env, char *name, char *alias );
+ void (JK_METHOD *alias)(struct jk_env *env, const char *name, const char *alias
);
/** Get an object by name, using the full name
*/
@@ -283,17 +283,17 @@
/** Get an object by name, using the split name ( type + localName )
*/
void *
- (JK_METHOD *getByName2)(struct jk_env *env, char *type, char *localName);
+ (JK_METHOD *getByName2)(struct jk_env *env, const char *type, const char
*localName);
/** Return the configuration object
*/
struct jk_bean *
- (JK_METHOD *getBean)( struct jk_env *env, char *name );
+ (JK_METHOD *getBean)( struct jk_env *env, const char *name );
/** Return the configuration object
*/
struct jk_bean *
- (JK_METHOD *getBean2)( struct jk_env *env, char *type, char *localName );
+ (JK_METHOD *getBean2)( struct jk_env *env, const char *type, const char
*localName );
/** Register a factory for a type ( channel, worker ).
*/
1.5 +9 -2 jakarta-tomcat-connectors/jk/native2/include/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_global.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_global.h 21 Feb 2002 11:15:04 -0000 1.4
+++ jk_global.h 12 Apr 2002 21:49:03 -0000 1.5
@@ -59,7 +59,7 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
#ifndef JK_GLOBAL_H
@@ -190,11 +190,17 @@
#define FILE_SEPERATOR ('\\')
#define FILE_SEPARATOR_STR ("\\")
#define PATH_ENV_VARIABLE ("PATH")
-
+
/* incompatible names... */
#ifndef strcasecmp
#define strcasecmp stricmp
#endif
+ #ifndef strncasecmp
+ #define strncasecmp strnicmp
+ #endif
+ #ifndef vsnprintf
+ #define vsnprintf _vsnprintf
+ #endif
#else
#define JK_METHOD
#define C_LEVEL_TRY_START
@@ -206,6 +212,7 @@
#define PATH_SEPARATOR_STR (":")
#define FILE_SEPARATOR_STR ("/")
#define PATH_ENV_VARIABLE ("LD_LIBRARY_PATH")
+ #define HAVE_UNIXSOCKETS
#endif
/*
1.6 +1 -1 jakarta-tomcat-connectors/jk/native2/include/jk_handler.h
Index: jk_handler.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_handler.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_handler.h 18 Mar 2002 17:57:41 -0000 1.5
+++ jk_handler.h 12 Apr 2002 21:49:03 -0000 1.6
@@ -140,7 +140,7 @@
jk_handler_callback callback;
- int (*init)( struct jk_env *env, struct jk_handler *handler,
+ int (JK_METHOD *init)( struct jk_env *env, struct jk_handler *handler,
struct jk_workerEnv *workerEnv);
};
1.7 +2 -2 jakarta-tomcat-connectors/jk/native2/include/jk_logger.h
Index: jk_logger.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_logger.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jk_logger.h 26 Mar 2002 02:55:15 -0000 1.6
+++ jk_logger.h 12 Apr 2002 21:49:03 -0000 1.7
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Logger object definitions *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.6 $ *
+ * Version: $Revision: 1.7 $ *
***************************************************************************/
#ifndef JK_LOGGER_H
@@ -109,7 +109,7 @@
const char *file,
int line,
int level,
- char *fmt,
+ const char *fmt,
va_list msg);
};
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
