tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_status.c jk_shm.c jk_channel_apr_socket.c
Date Fri, 27 Sep 2002 13:07:28 GMT
mturk       2002/09/27 06:07:28

  Modified:    jk/native2/common jk_worker_status.c jk_shm.c
                        jk_channel_apr_socket.c
  Log:
  Fix the compiler warnings about 64->32 bits.
  
  Revision  Changes    Path
  1.31      +2 -2      jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c
  
  Index: jk_worker_status.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- jk_worker_status.c	8 Jul 2002 13:32:49 -0000	1.30
  +++ jk_worker_status.c	27 Sep 2002 13:07:28 -0000	1.31
  @@ -114,9 +114,9 @@
           s->jkprintf(env, s, "<td>%ld</td>\n",
                       (long)(stat->endTime - stat->startTime) );
           
  -        totalTime += stat->totalTime;
  +        totalTime += (long)stat->totalTime;
           if( maxTime < stat->maxTime )
  -            maxTime=stat->maxTime;
  +            maxTime = (long)stat->maxTime;
       }
   #endif
       s->jkprintf(env, s, "</tr>\n");
  
  
  
  1.30      +2 -2      jakarta-tomcat-connectors/jk/native2/common/jk_shm.c
  
  Index: jk_shm.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_shm.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- jk_shm.c	24 Sep 2002 22:41:48 -0000	1.29
  +++ jk_shm.c	27 Sep 2002 13:07:28 -0000	1.30
  @@ -162,7 +162,7 @@
   
       if( finfo.size < shm->size ) {
           char bytes[1024];
  -        apr_size_t toWrite=shm->size-finfo.size;
  +        apr_size_t toWrite = (apr_size_t)(shm->size-finfo.size);
           apr_off_t off=0;
           
           memset( bytes, 0, 1024 );        
  @@ -190,7 +190,7 @@
       /* Now mmap it
        */
       rc=apr_mmap_create( &aprMmap,  file, (apr_off_t)0,
  -                        finfo.size, APR_MMAP_READ | APR_MMAP_WRITE,
  +                        (apr_size_t)finfo.size, APR_MMAP_READ | APR_MMAP_WRITE,
                           globalShmPool );
       if( rc!=JK_OK ) {
           char error[256];
  
  
  
  1.25      +1 -1      jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c
  
  Index: jk_channel_apr_socket.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_apr_socket.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- jk_channel_apr_socket.c	8 Jul 2002 13:42:03 -0000	1.24
  +++ jk_channel_apr_socket.c	27 Sep 2002 13:07:28 -0000	1.25
  @@ -218,7 +218,7 @@
   
       apr_socket_t *sock=endpoint->channelData;
       apr_status_t ret;
  -    apr_int32_t timeout = socketInfo->timeout * APR_USEC_PER_SEC;
  +    apr_int32_t timeout = (apr_int32_t)(socketInfo->timeout * APR_USEC_PER_SEC);
       char msg[128];
   
       if (apr_socket_create(&sock, remote_sa->family, SOCK_STREAM,
  
  
  

--
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