tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/include jk_logger.h jk_service.h
Date Wed, 05 Jun 2002 21:56:39 GMT
nacho       2002/06/05 14:56:39

  Modified:    jk/native2/common jk_config_file.c jk_mutex_proc.c
                        jk_mutex_thread.c jk_objCache.c
               jk/native2/include jk_logger.h jk_service.h
  Log:
  * Fixed some warnings
  
  Revision  Changes    Path
  1.2       +0 -3      jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
  
  Index: jk_config_file.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_config_file.c	31 May 2002 18:05:29 -0000	1.1
  +++ jk_config_file.c	5 Jun 2002 21:56:39 -0000	1.2
  @@ -245,7 +245,6 @@
                                       int *didReload, int firstTime)
   {
       int rc;
  -    int csOk;
       struct stat statbuf;
   
       if( didReload!=NULL )
  @@ -370,8 +369,6 @@
                           const char *type, const char *name)
   {
       jk_config_t *_this;
  -    jk_bean_t *jkb;
  -    int i;
   
       _this=(jk_config_t *)pool->alloc(env, pool, sizeof(jk_config_t));
       if( _this == NULL )
  
  
  
  1.2       +0 -1      jakarta-tomcat-connectors/jk/native2/common/jk_mutex_proc.c
  
  Index: jk_mutex_proc.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_proc.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_mutex_proc.c	31 May 2002 17:52:05 -0000	1.1
  +++ jk_mutex_proc.c	5 Jun 2002 21:56:39 -0000	1.2
  @@ -157,7 +157,6 @@
                                  const char *type, const char *name)
   {
       jk_mutex_t *mutex;
  -    jk_workerEnv_t *wEnv;
   
       mutex=(jk_mutex_t *)pool->calloc(env, pool, sizeof(jk_mutex_t));
   
  
  
  
  1.3       +0 -1      jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c
  
  Index: jk_mutex_thread.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_mutex_thread.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jk_mutex_thread.c	31 May 2002 22:51:28 -0000	1.2
  +++ jk_mutex_thread.c	5 Jun 2002 21:56:39 -0000	1.3
  @@ -235,7 +235,6 @@
                                           const char *type, const char *name)
   {
       jk_mutex_t *mutex;
  -    jk_workerEnv_t *wEnv;
   
       mutex=(jk_mutex_t *)pool->calloc(env, pool, sizeof(jk_mutex_t));
   
  
  
  
  1.8       +0 -3      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_objCache.c	31 May 2002 18:09:13 -0000	1.7
  +++ jk_objCache.c	5 Jun 2002 21:56:39 -0000	1.8
  @@ -102,7 +102,6 @@
   
   static int
   jk2_objCache_init(jk_env_t *env, jk_objCache_t *_this, int cacheSize ) {
  -    int i;
       jk_bean_t *jkb;
       
       if( cacheSize <= 0 ) {
  @@ -131,7 +130,6 @@
   
   static int  
   jk2_objCache_destroy(jk_env_t *env, jk_objCache_t *_this ) {
  -    int i;
   
       if( _this->cs != NULL ) 
           _this->cs->mbean->destroy( env, _this->cs->mbean );
  @@ -146,7 +144,6 @@
   static void * 
   jk2_objCache_get(jk_env_t *env, jk_objCache_t *_this )
   {
  -    int rc;
       void *ae=NULL;
   
       if( _this->cs != NULL )
  
  
  
  1.8       +3 -1      jakarta-tomcat-connectors/jk/native2/include/jk_logger.h
  
  Index: jk_logger.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_logger.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- jk_logger.h	12 Apr 2002 21:49:03 -0000	1.7
  +++ jk_logger.h	5 Jun 2002 21:56:39 -0000	1.8
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: Logger object definitions                                  *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.7 $                                           *
  + * Version:     $Revision: 1.8 $                                           *
    ***************************************************************************/
   
   #ifndef JK_LOGGER_H
  @@ -128,6 +128,8 @@
   #define JK_LOG_INFO  __FILE__,__LINE__,JK_LOG_INFO_LEVEL
   #define JK_LOG_ERROR __FILE__,__LINE__,JK_LOG_ERROR_LEVEL
   #define JK_LOG_EMERG __FILE__,__LINE__,JK_LOG_EMERG_LEVEL
  +
  +int jk2_logger_file_parseLogLevel(struct jk_env *env, const char *level);
   
   #ifdef __cplusplus
   }
  
  
  
  1.15      +2 -2      jakarta-tomcat-connectors/jk/native2/include/jk_service.h
  
  Index: jk_service.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_service.h	15 May 2002 19:32:42 -0000	1.14
  +++ jk_service.h	5 Jun 2002 21:56:39 -0000	1.15
  @@ -63,7 +63,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * Author:      Dan Milstein <danmil@shore.net>                            *
    * Author:      Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.14 $                                           *
  + * Version:     $Revision: 1.15 $                                           *
    ***************************************************************************/
   
   #ifndef JK_SERVICE_H
  @@ -311,7 +311,7 @@
        * Write a chunk of response data back to the browser.
        */
       int (JK_METHOD *write)(struct jk_env *env, jk_ws_service_t *s,
  -                           const void *buffer, int len);
  +                           const void *buffer, unsigned len);
   
       /*
        * Flush the output buffers.
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message