Author: mturk
Date: Mon Mar 26 22:36:13 2007
New Revision: 522764
URL: http://svn.apache.org/viewvc?view=rev&rev=522764
Log:
JK name prefix file_logger_t structure, No functional changes
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_logger.h
tomcat/connectors/trunk/jk/native/common/jk_util.c
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=522764&r1=522763&r2=522764
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Mar 26 22:36:13
2007
@@ -2366,7 +2366,7 @@
if (l &&
(l->level <= level || level == JK_LOG_REQUEST_LEVEL) &&
l->logger_private && what) {
- file_logger_t *flp = l->logger_private;
+ jk_file_logger_t *flp = l->logger_private;
int log_fd = flp->log_fd;
size_t sz = strlen(what);
if (log_fd >= 0 && sz) {
@@ -2405,7 +2405,7 @@
int jklogfd;
piped_log *pl;
jk_logger_t *jkl;
- file_logger_t *flp;
+ jk_file_logger_t *flp;
jk_server_conf_t *conf =
(jk_server_conf_t *) ap_get_module_config(s->module_config,
&jk_module);
@@ -2469,7 +2469,7 @@
}
conf->log_fd = jklogfd;
jkl = (jk_logger_t *)ap_palloc(p, sizeof(jk_logger_t));
- flp = (file_logger_t *)ap_palloc(p, sizeof(file_logger_t));
+ flp = (jk_file_logger_t *)ap_palloc(p, sizeof(jk_file_logger_t));
if (jkl && flp) {
jkl->log = jk_log_to_file;
jkl->level = conf->log_level;
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?view=diff&rev=522764&r1=522763&r2=522764
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Mar 26 22:36:13
2007
@@ -2500,7 +2500,7 @@
char error[256];
if (sz) {
apr_status_t status;
- file_logger_t *p = l->logger_private;
+ jk_file_logger_t *p = l->logger_private;
if (p->jklogfp) {
apr_status_t rv;
rv = apr_global_mutex_lock(jk_log_lock);
@@ -2554,7 +2554,7 @@
apr_file_t *jklogfp;
piped_log *pl;
jk_logger_t *jkl;
- file_logger_t *flp;
+ jk_file_logger_t *flp;
int jklog_flags = (APR_WRITE | APR_APPEND | APR_CREATE);
apr_fileperms_t jklog_mode =
(APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD);
@@ -2606,7 +2606,7 @@
}
conf->jklogfp = jklogfp;
jkl = (jk_logger_t *)apr_palloc(p, sizeof(jk_logger_t));
- flp = (file_logger_t *) apr_palloc(p, sizeof(file_logger_t));
+ flp = (jk_file_logger_t *) apr_palloc(p, sizeof(jk_file_logger_t));
if (jkl && flp) {
jkl->log = jk_log_to_file;
jkl->level = conf->log_level;
Modified: tomcat/connectors/trunk/jk/native/common/jk_logger.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_logger.h?view=diff&rev=522764&r1=522763&r2=522764
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_logger.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_logger.h Mon Mar 26 22:36:13
2007
@@ -42,8 +42,8 @@
};
-typedef struct file_logger_t file_logger_t;
-struct file_logger_t
+typedef struct jk_file_logger_t jk_file_logger_t;
+struct jk_file_logger_t
{
FILE *logfile;
/* For Apache 2 APR piped logging */
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?view=diff&rev=522764&r1=522763&r2=522764
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Mon Mar 26 22:36:13 2007
@@ -397,7 +397,7 @@
if (l &&
(l->level <= level || level == JK_LOG_REQUEST_LEVEL) &&
l->logger_private && what) {
- file_logger_t *p = l->logger_private;
+ jk_file_logger_t *p = l->logger_private;
if (p->logfile) {
fputs(what, p->logfile);
/* [V] Flush the dam' thing! */
@@ -442,7 +442,7 @@
if (l && file) {
jk_logger_t *rc = (jk_logger_t *)malloc(sizeof(jk_logger_t));
- file_logger_t *p = (file_logger_t *) malloc(sizeof(file_logger_t));
+ jk_file_logger_t *p = (jk_file_logger_t *)
malloc(sizeof(jk_file_logger_t));
if (rc && p) {
rc->log = log_to_file;
rc->level = level;
@@ -473,7 +473,7 @@
int jk_close_file_logger(jk_logger_t **l)
{
if (l && *l) {
- file_logger_t *p = (*l)->logger_private;
+ jk_file_logger_t *p = (*l)->logger_private;
if (p) {
fflush(p->logfile);
fclose(p->logfile);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
