costin 02/04/25 11:51:15 Modified: jk/native2/common jk_objCache.c jk_pool.c Log: Update rc. Revision Changes Path 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 -0000 1.5 +++ jk_objCache.c 25 Apr 2002 18:51:15 -0000 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 -0000 1.8 +++ jk_pool.c 25 Apr 2002 18:51:15 -0000 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: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>