cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_objCache.c jk_pool.c

2002-04-25 Thread costin 

costin  02/04/25 11:51:15

  Modified:jk/native2/common jk_objCache.c jk_pool.c
  Log:
  Update rc.
  
  Revision  ChangesPath
  1.6   +9 -9  jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c
  
  Index: jk_objCache.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_objCache.c 21 Feb 2002 11:12:11 -  1.5
  +++ jk_objCache.c 25 Apr 2002 18:51:15 -  1.6
  @@ -70,7 +70,7 @@
   int rc;
   
   if(_this->size <= 0 )
  -return JK_FALSE;
  +return JK_ERR;
   
   
   JK_ENTER_CS(&_this->cs, rc);
  @@ -96,14 +96,14 @@
   }
   
   JK_LEAVE_CS(&_this->cs, rc);
  -if(rc) {
  +if(rc==JK_TRUE) {
   /*   l->jkLog(l, JK_LOG_DEBUG, "Return endpoint to pool\n"); */
  -return JK_TRUE;
  +return JK_OK;
   }
   }
   
   /* Can't enter CS */ 
  -return JK_FALSE; 
  +return JK_ERR; 
   }
   
   static int
  @@ -123,16 +123,16 @@
sizeof(void *) * _this->size);
   
   if( _this->data==NULL )
  -return JK_FALSE;
  +return JK_ERR;
   
   JK_INIT_CS(&(_this->cs), i);
   if (!i) {
   env->l->jkLog(env, env->l, JK_LOG_ERROR,
 "objCache.create(): Can't init CS\n");
  -return JK_FALSE;
  +return JK_ERR;
   }
   
  -return JK_TRUE;
  +return JK_OK;
   }
   
   static int  
  @@ -144,7 +144,7 @@
   _this->count=0;
   /* Nothing to free, we use pools */
   
  -return JK_TRUE;
  +return JK_OK;
   }
   
   
  @@ -155,7 +155,7 @@
   void *ae=NULL;
   
   JK_ENTER_CS(&_this->cs, rc);
  -if (rc) {
  +if (rc==JK_TRUE) {
   if( _this->count > 0 ) {
   _this->count--;
   ae=_this->data[ _this->count ];
  
  
  
  1.9   +3 -3  jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
  
  Index: jk_pool.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jk_pool.c 12 Apr 2002 00:01:06 -  1.8
  +++ jk_pool.c 25 Apr 2002 18:51:15 -  1.9
  @@ -58,7 +58,7 @@
   /***
* Description: Simple memory pool *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.8 $   *
  + * Version: $Revision: 1.9 $   *
***/
   
   #include "jk_pool.h"
  @@ -143,7 +143,7 @@
   
   *newPool = _this;
   
  -return JK_TRUE;
  +return JK_OK;
   }
   
   static jk_pool_t *jk2_pool_createChild( jk_env_t *env, jk_pool_t *parent, int size 
) {
  @@ -328,7 +328,7 @@
   
   *result=_this;
   
  -return JK_TRUE;
  +return JK_OK;
   }
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_objCache.c jk_pool.c jk_registry.c jk_registry.h

2002-02-21 Thread hgomez 

hgomez  02/02/21 03:12:11

  Modified:jk/native2/common jk_objCache.c jk_pool.c jk_registry.c
jk_registry.h
  Log:
  Fourth batch of jk2 renaming
  
  Revision  ChangesPath
  1.5   +9 -9  jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c
  
  Index: jk_objCache.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_objCache.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jk_objCache.c 6 Feb 2002 19:14:50 -   1.4
  +++ jk_objCache.c 21 Feb 2002 11:12:11 -  1.5
  @@ -65,7 +65,7 @@
   #include "jk_objCache.h"
   
   static int 
  -jk_objCache_put(jk_env_t *env, jk_objCache_t *_this, void *obj)
  +jk2_objCache_put(jk_env_t *env, jk_objCache_t *_this, void *obj)
   {
   int rc;
   
  @@ -107,7 +107,7 @@
   }
   
   static int
  -jk_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
  +jk2_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
   int i;
   
   if( cacheSize <= 0 ) {
  @@ -136,7 +136,7 @@
   }
   
   static int  
  -jk_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
  +jk2_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
   int i;
   
   JK_DELETE_CS(&(_this->cs), i);
  @@ -149,7 +149,7 @@
   
   
   static void * 
  -jk_objCache_get(jk_env_t *env, jk_objCache_t *_this )
  +jk2_objCache_get(jk_env_t *env, jk_objCache_t *_this )
   {
   int rc;
   void *ae=NULL;
  @@ -168,7 +168,7 @@
   return NULL;
   }
   
  -jk_objCache_t *jk_objCache_create(jk_env_t *env, jk_pool_t *pool ) {
  +jk_objCache_t *jk2_objCache_create(jk_env_t *env, jk_pool_t *pool ) {
   jk_objCache_t *_this=pool->calloc( env, pool, sizeof( jk_objCache_t ));
   
   _this->pool=pool;
  @@ -177,10 +177,10 @@
   _this->size=0;
   _this->maxSize=-1;
   
  -_this->get=jk_objCache_get;
  -_this->put=jk_objCache_put;
  -_this->init=jk_objCache_init;
  -_this->destroy=jk_objCache_destroy;
  +_this->get=jk2_objCache_get;
  +_this->put=jk2_objCache_put;
  +_this->init=jk2_objCache_init;
  +_this->destroy=jk2_objCache_destroy;
   
   return _this;
   }
  
  
  
  1.6   +40 -40jakarta-tomcat-connectors/jk/native2/common/jk_pool.c
  
  Index: jk_pool.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_pool.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jk_pool.c 16 Dec 2001 23:29:55 -  1.5
  +++ jk_pool.c 21 Feb 2002 11:12:11 -  1.6
  @@ -58,7 +58,7 @@
   /***
* Description: Simple memory pool *
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.5 $   *
  + * Version: $Revision: 1.6 $   *
***/
   
   #include "jk_pool.h"
  @@ -81,34 +81,34 @@
   
   typedef struct jk_pool_private jk_pool_private_t;
   
  -int jk_pool_create( jk_env_t *env, jk_pool_t **newPool,
  +int jk2_pool_create( jk_env_t *env, jk_pool_t **newPool,
   jk_pool_t *parent, int size );
   
  -int JK_METHOD jk_pool_factory( jk_env_t *env, void **result,
  +int JK_METHOD jk2_pool_factory( jk_env_t *env, void **result,
  char *type, char *name);
   
  -static jk_pool_t *jk_pool_createChild( jk_env_t *env,
  -   jk_pool_t *parent, int size );
  +static jk_pool_t *jk2_pool_createChild(jk_env_t *env,
  +   jk_pool_t *parent, int size);
   
  -static void *jk_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p, 
  -   size_t size);
  +static void *jk2_pool_dyn_alloc(jk_env_t *env, jk_pool_t *p, 
  +size_t size);
   
  -static void jk_pool_reset(jk_env_t *env, jk_pool_t *p);
  +static void jk2_pool_reset(jk_env_t *env, jk_pool_t *p);
   
  -static void jk_pool_close(jk_env_t *env, jk_pool_t *p);
  +static void jk2_pool_close(jk_env_t *env, jk_pool_t *p);
   
  -static void *jk_pool_alloc(jk_env_t *env, jk_pool_t *p, size_t size);
  +static void *jk2_pool_alloc(jk_env_t *env, jk_pool_t *p, size_t size);
   
  -static void *jk_pool_calloc(jk_env_t *env, jk_pool_t *p, size_t size);
  +static void *jk2_pool_calloc(jk_env_t *env, jk_pool_t *p, size_t size);
   
  -static void *jk_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
  +static void *jk2_pool_strdup(jk_env_t *env, jk_pool_t *p, const char *s);
   
  -static void *jk_pool_realloc(jk_env_t *env, jk_pool_t *p, size_t sz,const void *old,
  -