cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c

[mturk]

mturk       2004/12/07 06:02:51

  Modified:    jk/native/apache-1.3 mod_jk.c
  Log:
  Fix compile time warnings.
  
  Revision  Changes    Path
  1.58      +2 -3      jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_jk.c  7 Dec 2004 13:46:55 -0000       1.57
  +++ mod_jk.c  7 Dec 2004 14:02:51 -0000       1.58
  @@ -1589,7 +1589,7 @@
       }
   
       /* Set up r->read_chunked flags for chunked encoding, if present */
  -    if (rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) {
  +    if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK))) {
           return rc;
       }
   
  @@ -1655,7 +1655,6 @@
   #ifndef NO_GETTIMEOFDAY
                   if (conf->format != NULL) {
                       char *duration = NULL;
  -                    char *status = NULL;
                       long micro, seconds;
                       gettimeofday(&tv_end, NULL);
                       if (tv_end.tv_usec < tv_begin.tv_usec) {
  @@ -1665,7 +1664,7 @@
                       micro = tv_end.tv_usec - tv_begin.tv_usec;
                       seconds = tv_end.tv_sec - tv_begin.tv_sec;
                       duration =
  -                        ap_psprintf(r->pool, "%.1d.%.6d", seconds, micro);
  +                        ap_psprintf(r->pool, "%.1ld.%.6ld", seconds, micro);
                       ap_table_setn(r->notes, JK_DURATION, duration);
                       request_log_transaction(r, conf);
                   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]