tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r410814 - /tomcat/connectors/trunk/jk/native/common/jk_util.c
Date Thu, 01 Jun 2006 09:34:08 GMT
Author: mturk
Date: Thu Jun  1 02:34:07 2006
New Revision: 410814

URL: http://svn.apache.org/viewvc?rev=410814&view=rev
Log:
Fix compile time warning by using proper value types.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_util.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?rev=410814&r1=410813&r2=410814&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Thu Jun  1 02:34:07 2006
@@ -137,7 +137,7 @@
     struct tm *tms;
 
     tms = localtime(&t);
-    strftime(str, len, jk_log_fmt, tms);
+    return strftime(str, len, jk_log_fmt, tms);
 }
 
 /* Write at most n characters to the buffer in str, return the
@@ -281,23 +281,23 @@
            const char *fmt, ...)
 {
     int rc = 0;
-/* Need to reserve space for newline and terminating zero byte. */
-    static size_t usable_size = HUGE_BUFFER_SIZE-2;
+    /* Need to reserve space for newline and terminating zero byte. */
+    static int usable_size = HUGE_BUFFER_SIZE-2;
     if (!l || !file || !fmt) {
         return -1;
     }
 
     if ((l->level <= level) || (level == JK_LOG_REQUEST_LEVEL)) {
 #ifdef NETWARE
-/* On NetWare, this can get called on a thread that has a limited stack so */
-/* we will allocate and free the temporary buffer in this function         */
+        /* On NetWare, this can get called on a thread that has a limited stack so */
+        /* we will allocate and free the temporary buffer in this function         */
         char *buf;
 #else
         char buf[HUGE_BUFFER_SIZE];
 #endif
         char *f = (char *)(file + strlen(file) - 1);
         va_list args;
-        size_t used = 0;
+        int used = 0;
 
         while (f != file && '\\' != *f && '/' != *f) {
             f--;



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


Mime
View raw message