Ok, so with the previous patch stuff built - this one fixes some
_really_ dodgy casts and type errors that were going on (someone 'fixed'
these by casting them to void pointers.). Also added some JK_METHOD
attributes to a couple more methods, and removed the corresponding void
pointer casts for those.
Everything builds nicely under MSVC6 now.
Michael Smith
Index: jk_env.c
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/jk/native/common/jk_env.c,v
retrieving revision 1.3
diff -u -r1.3 jk_env.c
--- jk_env.c 2001/11/11 01:17:43 1.3
+++ jk_env.c 2001/11/19 01:44:43
@@ -63,10 +63,10 @@
/* Private methods
*/
static jk_env_initEnv( jk_env_t *env, char *id );
-static jk_env_objectFactory_t *jk_env_getFactory(jk_env_t *env,
+static jk_env_objectFactory_t * JK_METHOD jk_env_getFactory(jk_env_t
*env,
char *type,
char *name );
-static void jk_env_registerFactory(jk_env_t *env,
+static void JK_METHOD jk_env_registerFactory(jk_env_t *env,
char *type,
char *name,
jk_env_objectFactory_t fact);
@@ -88,14 +88,14 @@
static jk_env_initEnv( jk_env_t *env, char *id ) {
/* env->logger=NULL; */
/* map_alloc( & env->properties ); */
- env->getFactory= (void *)jk_env_getFactory;
- env->registerFactory= (void *)jk_env_registerFactory;
+ env->getFactory= jk_env_getFactory;
+ env->registerFactory= jk_env_registerFactory;
map_alloc( & env->_registry);
jk_registry_init(env);
}
-static jk_env_objectFactory_t *jk_env_getFactory(jk_env_t *env,
+static jk_env_objectFactory_t * JK_METHOD jk_env_getFactory(jk_env_t
*env,
char *type,
char *name )
{
@@ -111,7 +111,7 @@
return result;
}
-static void jk_env_registerFactory(jk_env_t *env,
+static void JK_METHOD jk_env_registerFactory(jk_env_t *env,
char *type,
char *name,
jk_env_objectFactory_t fact)
Index: jk_env.h
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/jk/native/common/jk_env.h,v
retrieving revision 1.2
diff -u -r1.2 jk_env.h
--- jk_env.h 2001/11/11 01:17:43 1.2
+++ jk_env.h 2001/11/19 01:44:43
@@ -100,10 +100,9 @@
* for the various web servers (since the only link is through
* jk_worker_list.h).
*/
-typedef int (JK_METHOD *jk_env_objectFactory_t)(jk_env_t *env,
- void **result,
- char *type,
- char *name);
+typedef int (JK_METHOD *jk_env_objectFactory_t)(jk_worker_t **w,
+ const char *name,
+ jk_logger_t *l);
/** Get a pointer to the jk_env. We could support multiple
* env 'instances' in future - for now it's a singleton.
Index: jk_registry.c
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-connectors/jk/native/common/jk_registry
.c,v
retrieving revision 1.5
diff -u -r1.5 jk_registry.c
--- jk_registry.c 2001/11/16 22:59:06 1.5
+++ jk_registry.c 2001/11/19 01:44:44
@@ -123,11 +123,11 @@
printf("jk_registry_init: Assertion failed, env==NULL\n" );
return;
}
- env->registerFactory( env, "worker", "ajp13", (void
*)&ajp13_worker_factory )
;
- env->registerFactory( env, "worker", "ajp14", (void
*)&ajp14_worker_factory )
;
- env->registerFactory( env, "worker", "lb", (void
*)&lb_worker_factory );
+ env->registerFactory( env, "worker", "ajp13", &ajp13_worker_factory
);
+ env->registerFactory( env, "worker", "ajp14", &ajp14_worker_factory
);
+ env->registerFactory( env, "worker", "lb", &lb_worker_factory );
#ifdef HAVE_JNI
- env->registerFactory( env, "worker", "jni", (void
*)&jni_worker_factory );
+ env->registerFactory( env, "worker", "jni", &jni_worker_factory );
#endif
env->registerFactory( env, "channel", "socket",
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
