hgomez 02/02/21 03:18:06
Modified: jk/native2/server/apache2 jk_apache2.h jk_logger_apache2.c
jk_map_aprtable.c jk_pool_apr.c
Log:
Tenth Batch of jK2 renaming (you know what I'm happy)
Revision Changes Path
1.4 +6 -6 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h
Index: jk_apache2.h
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_apache2.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_apache2.h 16 Dec 2001 23:36:58 -0000 1.3
+++ jk_apache2.h 21 Feb 2002 11:18:05 -0000 1.4
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.3 $
+ * Version: $Revision: 1.4 $
*/
#include "jk_global.h"
@@ -73,21 +73,21 @@
#include "jk_requtil.h"
-int jk_service_apache2_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_service_apache2_factory(jk_env_t *env, jk_pool_t *pool,
void **result, char *type, char *name);
-int jk_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
void **result, char *type, char *name);
-int jk_pool_apr_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_pool_apr_factory(jk_env_t *env, jk_pool_t *pool,
void **result, char *type, char *name);
-int jk_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
char *type, char *name);
/* Temp. - we should use the factory ( we may need few changes ) */
-int jk_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
+int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
apr_pool_t *aprPool);
1.13 +9 -9
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c
Index: jk_logger_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_logger_apache2.c 6 Jan 2002 09:06:02 -0000 1.12
+++ jk_logger_apache2.c 21 Feb 2002 11:18:05 -0000 1.13
@@ -87,12 +87,12 @@
#define HUGE_BUFFER_SIZE (8*1024)
-int JK_METHOD jk_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
+int JK_METHOD jk2_logger_apache2_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
char *type, char *name);
-static int jk_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
+static int jk2_logger_apache2_log(jk_env_t *env, jk_logger_t *l,
int level,
const char *what)
{
@@ -100,18 +100,18 @@
}
-static int jk_logger_apache2_open(jk_env_t *env, jk_logger_t *_this,
+static int jk2_logger_apache2_open(jk_env_t *env, jk_logger_t *_this,
jk_map_t *properties )
{
return JK_TRUE;
}
-static int jk_logger_apache2_close(jk_env_t *env, jk_logger_t *_this)
+static int jk2_logger_apache2_close(jk_env_t *env, jk_logger_t *_this)
{
return JK_TRUE;
}
-static int jk_logger_apache2_jkLog(jk_env_t *env, jk_logger_t *l,
+static int jk2_logger_apache2_jkLog(jk_env_t *env, jk_logger_t *l,
const char *file,
int line,
int level,
@@ -168,7 +168,7 @@
}
-int jk_logger_apache2_factory(jk_env_t *env,
+int jk2_logger_apache2_factory(jk_env_t *env,
jk_pool_t *pool,
void **result,
char *type,
@@ -181,10 +181,10 @@
return JK_FALSE;
}
- l->log = jk_logger_apache2_log;
+ l->log = jk2_logger_apache2_log;
l->logger_private = NULL;
- l->open =jk_logger_apache2_open;
- l->jkLog = jk_logger_apache2_jkLog;
+ l->open =jk2_logger_apache2_open;
+ l->jkLog = jk2_logger_apache2_jkLog;
l->level=JK_LOG_ERROR_LEVEL;
1.6 +17 -17
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c
Index: jk_map_aprtable.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_map_aprtable.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_map_aprtable.c 26 Jan 2002 07:13:47 -0000 1.5
+++ jk_map_aprtable.c 21 Feb 2002 11:18:05 -0000 1.6
@@ -74,14 +74,14 @@
#include "jk_apache2.h"
-static void *jk_map_aprtable_get( struct jk_env *env, struct jk_map *_this,
+static void *jk2_map_aprtable_get( struct jk_env *env, struct jk_map *_this,
const char *name)
{
apr_table_t *aprMap=_this->_private;
return (void *)apr_table_get( aprMap, name );
}
-static int jk_map_aprtable_put( struct jk_env *env, struct jk_map *_this,
+static int jk2_map_aprtable_put( struct jk_env *env, struct jk_map *_this,
const char *name, void *value,
void **oldValue )
{
@@ -95,7 +95,7 @@
return JK_TRUE;
}
-static int jk_map_aprtable_add( struct jk_env *env, struct jk_map *_this,
+static int jk2_map_aprtable_add( struct jk_env *env, struct jk_map *_this,
const char *name, void *value )
{
apr_table_t *aprMap=_this->_private;
@@ -105,7 +105,7 @@
return JK_TRUE;
}
-static int jk_map_aprtable_size( struct jk_env *env, struct jk_map *_this )
+static int jk2_map_aprtable_size( struct jk_env *env, struct jk_map *_this )
{
apr_table_t *aprMap=_this->_private;
const apr_array_header_t *ah = apr_table_elts( aprMap );
@@ -114,7 +114,7 @@
}
-static char * jk_map_aprtable_nameAt( struct jk_env *env, struct jk_map *_this,
+static char * jk2_map_aprtable_nameAt( struct jk_env *env, struct jk_map *_this,
int pos)
{
apr_table_t *aprMap=_this->_private;
@@ -125,7 +125,7 @@
return elts[pos].key;
}
-static void * jk_map_aprtable_valueAt( struct jk_env *env, struct jk_map *_this,
+static void * jk2_map_aprtable_valueAt( struct jk_env *env, struct jk_map *_this,
int pos)
{
apr_table_t *aprMap=_this->_private;
@@ -135,20 +135,20 @@
return elts[pos].val;
}
-static void jk_map_aprtable_init(jk_env_t *env, jk_map_t *m, int initialSize,
+static void jk2_map_aprtable_init(jk_env_t *env, jk_map_t *m, int initialSize,
void *wrappedObj)
{
m->_private=wrappedObj;
}
-static void jk_map_aprtable_clear(jk_env_t *env, jk_map_t *m)
+static void jk2_map_aprtable_clear(jk_env_t *env, jk_map_t *m)
{
}
/* Not used yet */
-int jk_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_map_aprtable_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
char *type, char *name)
{
@@ -156,14 +156,14 @@
*result=_this;
- _this->get=jk_map_aprtable_get;
- _this->put=jk_map_aprtable_put;
- _this->add=jk_map_aprtable_add;
- _this->size=jk_map_aprtable_size;
- _this->nameAt=jk_map_aprtable_nameAt;
- _this->valueAt=jk_map_aprtable_valueAt;
- _this->init=jk_map_aprtable_init;
- _this->clear=jk_map_aprtable_clear;
+ _this->get=jk2_map_aprtable_get;
+ _this->put=jk2_map_aprtable_put;
+ _this->add=jk2_map_aprtable_add;
+ _this->size=jk2_map_aprtable_size;
+ _this->nameAt=jk2_map_aprtable_nameAt;
+ _this->valueAt=jk2_map_aprtable_valueAt;
+ _this->init=jk2_map_aprtable_init;
+ _this->clear=jk2_map_aprtable_clear;
return JK_TRUE;
}
1.9 +29 -29
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c
Index: jk_pool_apr.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_pool_apr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_pool_apr.c 6 Jan 2002 09:06:02 -0000 1.8
+++ jk_pool_apr.c 21 Feb 2002 11:18:05 -0000 1.9
@@ -78,17 +78,17 @@
*/
-int jk_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
+int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
apr_pool_t *aprPool );
-int JK_METHOD jk_pool_apr_factory(jk_env_t *env,
+int JK_METHOD jk2_pool_apr_factory(jk_env_t *env,
jk_pool_t *pool,
void **result,
char *type, char *name);
/** Nothing - apache will take care ??
*/
-static void jk_pool_apr_close(jk_env_t *env, jk_pool_t *p)
+static void jk2_pool_apr_close(jk_env_t *env, jk_pool_t *p)
{
#ifdef JK_APR_POOL_DEBUG
fprintf(stderr, "apr_close %p\n", p);
@@ -99,7 +99,7 @@
XXX with jk pools we can implement 'recycling',
not sure what's the equivalent for apache
*/
-static void jk_pool_apr_reset(jk_env_t *env, jk_pool_t *p)
+static void jk2_pool_apr_reset(jk_env_t *env, jk_pool_t *p)
{
#ifdef JK_APR_POOL_DEBUG
fprintf(stderr, "apr_reset %p\n", p);
@@ -107,8 +107,8 @@
apr_pool_clear(p->_private);
}
-static void *jk_pool_apr_calloc(jk_env_t *env, jk_pool_t *p,
- size_t size)
+static void *jk2_pool_apr_calloc(jk_env_t *env, jk_pool_t *p,
+ size_t size)
{
#ifdef JK_APR_POOL_DEBUG
fprintf(stderr, "apr_calloc %p %d\n", p, size);
@@ -117,8 +117,8 @@
return apr_pcalloc( (apr_pool_t *)p->_private, (apr_size_t)size);
}
-static void *jk_pool_apr_alloc(jk_env_t *env, jk_pool_t *p,
- size_t size)
+static void *jk2_pool_apr_alloc(jk_env_t *env, jk_pool_t *p,
+ size_t size)
{
#ifdef JK_APR_POOL_DEBUG
fprintf(stderr, "apr_alloc %p %d\n", p, size);
@@ -127,10 +127,10 @@
return apr_palloc( (apr_pool_t *)p->_private, (apr_size_t)size);
}
-static void *jk_pool_apr_realloc(jk_env_t *env, jk_pool_t *p,
- size_t sz,
- const void *old,
- size_t old_sz)
+static void *jk2_pool_apr_realloc(jk_env_t *env, jk_pool_t *p,
+ size_t sz,
+ const void *old,
+ size_t old_sz)
{
void *rc;
@@ -141,7 +141,7 @@
return NULL;
}
- rc = jk_pool_apr_alloc(env, p, sz);
+ rc = jk2_pool_apr_alloc(env, p, sz);
if(rc) {
memcpy(rc, old, old_sz);
}
@@ -149,8 +149,8 @@
return rc;
}
-static void *jk_pool_apr_strdup(jk_env_t *env, jk_pool_t *p,
- const char *s)
+static void *jk2_pool_apr_strdup(jk_env_t *env, jk_pool_t *p,
+ const char *s)
{
#ifdef JK_APR_POOL_DEBUG
fprintf(stderr, "apr_strdup %p %d\n", p, ((s==NULL)?-1: (int)strlen(s)));
@@ -158,9 +158,9 @@
return apr_pstrdup( (apr_pool_t *)p->_private, s);
}
-static void jk_pool_apr_initMethods(jk_env_t *env, jk_pool_t *_this );
+static void jk2_pool_apr_initMethods(jk_env_t *env, jk_pool_t *_this );
-static jk_pool_t *jk_pool_apr_createChild( jk_env_t *env, jk_pool_t *_this,
+static jk_pool_t *jk2_pool_apr_createChild( jk_env_t *env, jk_pool_t *_this,
int sizeHint ) {
apr_pool_t *parentAprPool=_this->_private;
apr_pool_t *childAprPool;
@@ -170,14 +170,14 @@
newPool=(jk_pool_t *)apr_palloc(parentAprPool, sizeof( jk_pool_t ));
- jk_pool_apr_initMethods( env, newPool );
+ jk2_pool_apr_initMethods( env, newPool );
newPool->_private=childAprPool;
return newPool;
}
-int jk_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
+int jk2_pool_apr_create( jk_env_t *env, jk_pool_t **newPool, jk_pool_t *parent,
apr_pool_t *aprPool)
{
jk_pool_t *_this;
@@ -186,25 +186,25 @@
*newPool = _this;
_this->_private=aprPool;
- jk_pool_apr_initMethods( env, _this );
+ jk2_pool_apr_initMethods( env, _this );
return JK_TRUE;
}
-static void jk_pool_apr_initMethods(jk_env_t *env, jk_pool_t *_this )
+static void jk2_pool_apr_initMethods(jk_env_t *env, jk_pool_t *_this )
{
/* methods */
- _this->create=jk_pool_apr_createChild;
- _this->close=jk_pool_apr_close;
- _this->reset=jk_pool_apr_reset;
- _this->alloc=jk_pool_apr_alloc;
- _this->calloc=jk_pool_apr_calloc;
- _this->pstrdup=jk_pool_apr_strdup;
- _this->realloc=jk_pool_apr_realloc;
+ _this->create=jk2_pool_apr_createChild;
+ _this->close=jk2_pool_apr_close;
+ _this->reset=jk2_pool_apr_reset;
+ _this->alloc=jk2_pool_apr_alloc;
+ _this->calloc=jk2_pool_apr_calloc;
+ _this->pstrdup=jk2_pool_apr_strdup;
+ _this->realloc=jk2_pool_apr_realloc;
}
/* Not used yet */
-int jk_pool_apr_factory(jk_env_t *env, jk_pool_t *pool,
+int jk2_pool_apr_factory(jk_env_t *env, jk_pool_t *pool,
void **result,
char *type, char *name)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
