hgomez 02/02/21 03:15:52 Modified: jk/native2/include jk_msg.h jk_objCache.h jk_pool.h jk_requtil.h Log: Eigth Batch of renaming (zzz zzz zzz) Revision Changes Path 1.5 +2 -2 jakarta-tomcat-connectors/jk/native2/include/jk_msg.h Index: jk_msg.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_msg.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_msg.h 26 Jan 2002 06:22:41 -0000 1.4 +++ jk_msg.h 21 Feb 2002 11:15:51 -0000 1.5 @@ -171,7 +171,7 @@ /** * Special method. Will read data from the server and add them as - * bytes. It is equivalent with jk_requtil_readFully() in a buffer + * bytes. It is equivalent with jk2_requtil_readFully() in a buffer * and then jk_msg_appendBytes(), except that we use directly the * internal buffer. * @@ -196,7 +196,7 @@ }; /* Temp */ -jk_msg_t *jk_msg_ajp_create(struct jk_env *env, struct jk_pool *p, +jk_msg_t *jk2_msg_ajp_create(struct jk_env *env, struct jk_pool *p, int buffSize); #ifdef __cplusplus 1.6 +1 -1 jakarta-tomcat-connectors/jk/native2/include/jk_objCache.h Index: jk_objCache.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_objCache.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_objCache.h 6 Feb 2002 19:19:16 -0000 1.5 +++ jk_objCache.h 21 Feb 2002 11:15:51 -0000 1.6 @@ -78,7 +78,7 @@ #define JK_OBJCACHE_DEFAULT_SZ (128) -jk_objCache_t *jk_objCache_create(struct jk_env *env, struct jk_pool *pool ); +jk_objCache_t *jk2_objCache_create(struct jk_env *env, struct jk_pool *pool ); /** * Simple object cache ( or pool for java people - don't confuse with the 1.6 +2 -2 jakarta-tomcat-connectors/jk/native2/include/jk_pool.h Index: jk_pool.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_pool.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_pool.h 16 Dec 2001 23:17:23 -0000 1.5 +++ jk_pool.h 21 Feb 2002 11:15:51 -0000 1.6 @@ -58,7 +58,7 @@ /*************************************************************************** * Description: Memory Pool object header file * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.5 $ * + * Version: $Revision: 1.6 $ * ***************************************************************************/ #ifndef _JK_POOL_H #define _JK_POOL_H @@ -159,7 +159,7 @@ XXX move this to the factory */ -int jk_pool_create( struct jk_env *env, jk_pool_t **newPool, jk_pool_t *parent, int size ); +int jk2_pool_create( struct jk_env *env, jk_pool_t **newPool, jk_pool_t *parent, int size ); #ifdef __cplusplus 1.4 +9 -9 jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h Index: jk_requtil.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_requtil.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_requtil.h 16 Dec 2001 23:17:23 -0000 1.3 +++ jk_requtil.h 21 Feb 2002 11:15:51 -0000 1.4 @@ -154,50 +154,50 @@ /** Get header value using a lookup table. */ -const char *jk_requtil_getHeaderById(struct jk_env *env, int sc); +const char *jk2_requtil_getHeaderById(struct jk_env *env, int sc); /** * Get method id. */ -int jk_requtil_getMethodId(struct jk_env *env, const char *method, +int jk2_requtil_getMethodId(struct jk_env *env, const char *method, unsigned char *sc); /** * Get header id. */ -int jk_requtil_getHeaderId(struct jk_env *env, const char *header_name, +int jk2_requtil_getHeaderId(struct jk_env *env, const char *header_name, unsigned short *sc); /** Retrieve session id from the cookie or the parameter * (parameter first) */ -char *jk_requtil_getSessionId(struct jk_env *env, jk_ws_service_t *s); +char *jk2_requtil_getSessionId(struct jk_env *env, jk_ws_service_t *s); /** Retrieve the cookie with the given name */ -char *jk_requtil_getCookieByName(struct jk_env *env, jk_ws_service_t *s, +char *jk2_requtil_getCookieByName(struct jk_env *env, jk_ws_service_t *s, const char *name); /* Retrieve the parameter with the given name */ -char *jk_requtil_getPathParam(struct jk_env *env, jk_ws_service_t *s, const char *name); +char *jk2_requtil_getPathParam(struct jk_env *env, jk_ws_service_t *s, const char *name); /** Extract the 'route' from the session id. The route is * the id of the worker that generated the session and where all * further requests in that session will be sent. */ -char *jk_requtil_getSessionRoute(struct jk_env *env, jk_ws_service_t *s); +char *jk2_requtil_getSessionRoute(struct jk_env *env, jk_ws_service_t *s); /** Initialize the request * * jk_init_ws_service */ -void jk_requtil_initRequest(struct jk_env *env, jk_ws_service_t *s); +void jk2_requtil_initRequest(struct jk_env *env, jk_ws_service_t *s); -int jk_requtil_readFully(struct jk_env *env, jk_ws_service_t *s, +int jk2_requtil_readFully(struct jk_env *env, jk_ws_service_t *s, unsigned char *buf, unsigned len);
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>