costin 01/12/13 10:48:13
Modified: jk/native2/common jk_registry.c
Added: jk/native2/common jk_registry.h
Log:
Split jk_registry so we can get rid of the warnings ( and let the compiler
check our signatures ).
Revision Changes Path
1.6 +2 -51 jakarta-tomcat-connectors/jk/native2/common/jk_registry.c
Index: jk_registry.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_registry.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_registry.c 2001/12/12 21:55:57 1.5
+++ jk_registry.c 2001/12/13 18:48:13 1.6
@@ -60,9 +60,10 @@
#include "jk_service.h"
#include "jk_env.h"
+#include "jk_registry.h"
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -83,56 +84,6 @@
* @author: Costin Manolache
*
*/
-
-int JK_METHOD jk_worker_ajp14_factory( jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-
-int JK_METHOD jk_worker_lb_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-
-int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-int JK_METHOD jk_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-/* Factories for 'new' types. We use the new factory interface,
- * workers will be updated later
- */
-int JK_METHOD jk_channel_socket_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-int JK_METHOD jk_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-int JK_METHOD jk_uriMap_factory(jk_env_t *env, jk_pool_t *pool, void **result,
- const char *type, const char *name);
-
-int JK_METHOD jk_logger_file_factory(jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-
-int JK_METHOD jk_handler_logon_factory( jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-int JK_METHOD jk_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
-int JK_METHOD jk_handler_response_factory( jk_env_t *env, jk_pool_t *pool,
- void **result,
- const char *type, const char *name);
-
/**
* Init the components that we compile in by default.
1.1 jakarta-tomcat-connectors/jk/native2/common/jk_registry.h
Index: jk_registry.h
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999-2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Jk", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
#include "jk_logger.h"
#include "jk_pool.h"
#include "jk_service.h"
#include "jk_env.h"
/***************************************************************************
* Description: Worker list *
* Version: $Revision: 1.1 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
* needed to initialize the static 'type system' for jk.
*
* A better solution would use 'introspection' and dlsyms to locate the
* factory, using the common naming schema. This is a bit harder to implement
* ( we can do it later ) and may have problems on some buggy OSs ( I assume
* most decent systems support .so/.dll and symbols, but you can never know )
*
* Both solutions could be used in paralel - for start we'll use this
* hack and static registration. Don't put anything else here, just
* static declarations for the factory methods and the registrerFactory() call.
*
* (based on jk_worker_list.h )
* @author: Gal Shachor <[EMAIL PROTECTED]> *
* @author: Henri Gomez <[EMAIL PROTECTED]> *
* @author: Costin Manolache
*
*/
int JK_METHOD jk_worker_ajp14_factory( jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
int JK_METHOD jk_worker_lb_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
int JK_METHOD jk_worker_jni_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
int JK_METHOD jk_worker_ajp12_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
/* Factories for 'new' types. We use the new factory interface,
* workers will be updated later
*/
int JK_METHOD jk_channel_socket_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
int JK_METHOD jk_workerEnv_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
int JK_METHOD jk_uriMap_factory(jk_env_t *env, jk_pool_t *pool, void **result,
const char *type, const char *name);
int JK_METHOD jk_logger_file_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
int JK_METHOD jk_handler_logon_factory( jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
int JK_METHOD jk_handler_discovery_factory( jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
int JK_METHOD jk_handler_response_factory( jk_env_t *env, jk_pool_t *pool,
void **result,
const char *type, const char *name);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
