Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 63531 invoked from network); 2 Sep 2006 17:46:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Sep 2006 17:46:15 -0000 Received: (qmail 76240 invoked by uid 500); 2 Sep 2006 17:46:08 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 76214 invoked by uid 500); 2 Sep 2006 17:46:08 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 76203 invoked by uid 500); 2 Sep 2006 17:46:08 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 76200 invoked by uid 99); 2 Sep 2006 17:46:07 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Sep 2006 10:46:07 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Sep 2006 10:46:07 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 1815D1A981A; Sat, 2 Sep 2006 10:45:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439624 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Date: Sat, 02 Sep 2006 17:45:46 -0000 To: tomcat-dev@jakarta.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060902174547.1815D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Sat Sep 2 10:45:46 2006 New Revision: 439624 URL: http://svn.apache.org/viewvc?rev=439624&view=rev Log: Fix compile time warnings. Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?rev=439624&r1=439623&r2=439624&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original) +++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sat Sep 2 10:45:46 2006 @@ -1387,7 +1387,7 @@ */ static const char *jk_set_request_log_format(cmd_parms * cmd, - void *dummy, char *format) + void *dummy, const char *format) { const char *err_string = NULL; server_rec *s = cmd->server; @@ -1893,7 +1893,7 @@ } if (worker) { - apr_time_t request_begin; + apr_time_t request_begin = 0; int is_error = HTTP_INTERNAL_SERVER_ERROR; int rc = JK_FALSE; apache_private_data_t private_data; @@ -1914,7 +1914,7 @@ s.pool = &private_data.p; apr_table_setn(r->notes, JK_NOTE_WORKER_TYPE, wc_get_name_for_type(worker->type, xconf->log)); - + if (xconf->format != NULL) { request_begin = apr_time_now(); } @@ -1972,7 +1972,7 @@ apr_time_t rd = apr_time_now() - request_begin; seconds = (long)apr_time_sec(rd); micro = (long)(rd - apr_time_from_sec(seconds)); - + duration = apr_psprintf(r->pool, "%.1ld.%.6ld", seconds, micro); apr_table_setn(r->notes, JK_NOTE_REQUEST_DURATION, duration); if (s.jvm_route && *s.jvm_route) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org