nacho 2002/06/08 17:47:24
Modified: jk/native2/common jk_logger_file.c
Log:
* Fixing the build in win32
* Cosmetic changes
Revision Changes Path
1.25 +19 -14 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- jk_logger_file.c 7 Jun 2002 23:45:30 -0000 1.24
+++ jk_logger_file.c 9 Jun 2002 00:47:24 -0000 1.25
@@ -59,7 +59,7 @@
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.24 $ *
+ * Version: $Revision: 1.25 $ *
***************************************************************************/
#include "jk_env.h"
@@ -68,6 +68,7 @@
#include <stdio.h>
#include "jk_registry.h"
+#include "apr_strings.h"
#define LOG_FORMAT ("log_format")
@@ -90,11 +91,15 @@
static void jk2_logger_file_setTimeStr(jk_env_t *env,char * str, int len)
{
time_t t = time(NULL);
- struct tm *tms;
+ struct tm *tms;
- tms = gmtime(&t);
- if( tms==NULL ) return;
- strftime(str, len, jk2_logger_file_logFmt, tms);
+ tms = gmtime(&t);
+
+ if( tms==NULL ) {
+ return;
+ }
+
+ strftime(str, len, jk2_logger_file_logFmt, tms);
}
static int JK_METHOD jk2_logger_file_log(jk_env_t *env,jk_logger_t *l,
@@ -243,7 +248,7 @@
/* XXX or apr_ctime ? */
apr_rfc822_date( rfctime, time );
- fmt1=apr_pvsprintf( aprPool, "[%s] [%s:%d] %s", rfctime, file, line, fmt );
+ fmt1=apr_psprintf( aprPool, "[%s] [%s:%d] %s", rfctime, file, line, fmt );
buf=apr_pvsprintf( aprPool, fmt, args );
l->log(env, l, level, buf);
@@ -289,8 +294,8 @@
}
#ifdef WIN32
- jk2_logger_file_setTimeStr(env,buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+ jk2_logger_file_setTimeStr(env,buf, HUGE_BUFFER_SIZE);
+ used = strlen(buf);
if( level >= JK_LOG_DEBUG_LEVEL )
used += _snprintf(&buf[used], HUGE_BUFFER_SIZE, " [%s (%d)]: ", f,
line);
#elif defined(NETWARE) /* until we get a snprintf function */
@@ -298,18 +303,18 @@
if (NULL == buf)
return -1;
- jk2_logger_file_setTimeStr(buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+ jk2_logger_file_setTimeStr(buf, HUGE_BUFFER_SIZE);
+ used = strlen(buf);
if( level >= JK_LOG_DEBUG_LEVEL )
used += sprintf(&buf[used], " [%s (%d)]: ", f, line);
#else
- jk2_logger_file_setTimeStr(env, buf, HUGE_BUFFER_SIZE);
- used = strlen(buf);
+ jk2_logger_file_setTimeStr(env, buf, HUGE_BUFFER_SIZE);
+ used = strlen(buf);
if( level >= JK_LOG_DEBUG_LEVEL )
used += snprintf(&buf[used], HUGE_BUFFER_SIZE, " [%s (%d)]: ", f,
line);
#endif
if(used < 0) {
- return 0; /* [V] not sure what to return... */
+ return -1; /* [V] not sure what to return... */
}
#ifdef WIN32
@@ -320,7 +325,7 @@
rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
#endif
- l->log(env, l, level, buf);
+ l->log(env, l , level, buf);
#ifdef NETWARE
free(buf);
#endif
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
