diff options
| author | Martin Kraemer <martin@apache.org> | 2001-02-16 14:38:31 +0100 |
|---|---|---|
| committer | Martin Kraemer <martin@apache.org> | 2001-02-16 14:38:31 +0100 |
| commit | e7d5943f2897dd12d895f4ae2248ef7556e4e085 (patch) | |
| tree | 7de99d1c2ba637ca7a4c76cc00a76efb264bb01d /modules/loggers | |
| parent | add placeholder for proxy doc (diff) | |
| download | apache2-e7d5943f2897dd12d895f4ae2248ef7556e4e085.tar.xz apache2-e7d5943f2897dd12d895f4ae2248ef7556e4e085.zip | |
Rename the module structures so that the exported symbol matches
the file name, and it is easier to automate the installation
process (generating LoadModule directives from the module filenames).
Next step is to remove the 4th argument to the APACHE_MODULE macro
completely and require people to use the matching names, and to
reduce the LoadModule directive to 1 argument.... Objections?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88189 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/loggers')
| -rw-r--r-- | modules/loggers/config.m4 | 2 | ||||
| -rw-r--r-- | modules/loggers/mod_log_config.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4 index e1628c66f0..8d4304abc4 100644 --- a/modules/loggers/config.m4 +++ b/modules/loggers/config.m4 @@ -4,6 +4,6 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]]) APACHE_MODPATH_INIT(loggers) -APACHE_MODULE(log_config, logging configuration, , config_log, yes) +APACHE_MODULE(log_config, logging configuration, , , yes) APACHE_MODPATH_FINISH diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index 7d3a701b20..432059aecb 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -201,7 +201,7 @@ #define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b" -module AP_MODULE_DECLARE_DATA config_log_module; +module AP_MODULE_DECLARE_DATA log_config_module; static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE); static apr_fileperms_t xfer_perms = APR_OS_DEFAULT; @@ -952,7 +952,7 @@ static int config_log_transaction(request_rec *r, config_log_state *cls, static int multi_log_transaction(request_rec *r) { multi_log_state *mls = ap_get_module_config(r->server->module_config, - &config_log_module); + &log_config_module); config_log_state *clsarray; int i; @@ -1028,7 +1028,7 @@ static const char *log_format(cmd_parms *cmd, void *dummy, const char *fmt, { const char *err_string = NULL; multi_log_state *mls = ap_get_module_config(cmd->server->module_config, - &config_log_module); + &log_config_module); /* * If we were given two arguments, the second is a name to be given to the @@ -1054,7 +1054,7 @@ static const char *add_custom_log(cmd_parms *cmd, void *dummy, const char *fn, { const char *err_string = NULL; multi_log_state *mls = ap_get_module_config(cmd->server->module_config, - &config_log_module); + &log_config_module); config_log_state *cls; cls = (config_log_state *) apr_array_push(mls->config_logs); @@ -1151,7 +1151,7 @@ static config_log_state *open_multi_logs(server_rec *s, apr_pool_t *p) { int i; multi_log_state *mls = ap_get_module_config(s->module_config, - &config_log_module); + &log_config_module); config_log_state *clsarray; const char *dummy; const char *format; @@ -1211,7 +1211,7 @@ static apr_status_t flush_all_logs(void *data) int i; for (; s; s = s->next) { - mls = ap_get_module_config(s->module_config, &config_log_module); + mls = ap_get_module_config(s->module_config, &log_config_module); log_list = NULL; if (mls->config_logs->nelts) { log_list = mls->config_logs; @@ -1260,7 +1260,7 @@ static void register_hooks(apr_pool_t *p) ap_hook_log_transaction(multi_log_transaction,NULL,NULL,APR_HOOK_MIDDLE); } -module AP_MODULE_DECLARE_DATA config_log_module = +module AP_MODULE_DECLARE_DATA log_config_module = { STANDARD20_MODULE_STUFF, NULL, /* create per-dir config */ |