You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2010/06/09 21:31:26 UTC
svn commit: r953125 - in /httpd/httpd/trunk/include: http_config.h http_log.h
Author: sf
Date: Wed Jun 9 19:31:26 2010
New Revision: 953125
URL: http://svn.apache.org/viewvc?rev=953125&view=rev
Log:
Fix some issues found by Ruediger Pluem
Modified:
httpd/httpd/trunk/include/http_config.h
httpd/httpd/trunk/include/http_log.h
Modified: httpd/httpd/trunk/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=953125&r1=953124&r2=953125&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_config.h (original)
+++ httpd/httpd/trunk/include/http_config.h Wed Jun 9 19:31:26 2010
@@ -511,7 +511,6 @@ AP_DECLARE(int) ap_get_request_module_lo
* @param s The server for which to set the loglevel.
* @param index The module_index of the module to set the loglevel for.
* @param level The new log level
- * @return The module-specific loglevel
*/
AP_DECLARE(void) ap_set_module_loglevel(apr_pool_t *p, struct ap_logconf *l,
int index, int level);
Modified: httpd/httpd/trunk/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_log.h?rev=953125&r1=953124&r2=953125&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_log.h (original)
+++ httpd/httpd/trunk/include/http_log.h Wed Jun 9 19:31:26 2010
@@ -191,14 +191,14 @@ static int * const aplog_module_index;
#define APLOGcinfo(c) APLOG_C_IS_LEVEL(c,APLOG_INFO)
#define APLOGcdebug(c) APLOG_C_IS_LEVEL(c,APLOG_DEBUG)
-#define APLOGctrace1(r) APLOG_C_IS_LEVEL(c,APLOG_TRACE1)
-#define APLOGctrace2(r) APLOG_C_IS_LEVEL(c,APLOG_TRACE2)
-#define APLOGctrace3(r) APLOG_C_IS_LEVEL(c,APLOG_TRACE3)
-#define APLOGctrace4(r) APLOG_C_IS_LEVEL(c,APLOG_TRACE4)
-#define APLOGctrace5(r) APLOG_C_IS_LEVEL(c,APLOG_TRACE5)
-#define APLOGctrace6(r) APLOG_C_IS_LEVEL(c,APLOG_TRACE6)
-#define APLOGctrace7(r) APLOG_C_IS_LEVEL(c,APLOG_TRACE7)
-#define APLOGctrace8(r) APLOG_C_IS_LEVEL(c,APLOG_TRACE8)
+#define APLOGctrace1(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE1)
+#define APLOGctrace2(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE2)
+#define APLOGctrace3(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE3)
+#define APLOGctrace4(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE4)
+#define APLOGctrace5(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE5)
+#define APLOGctrace6(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE6)
+#define APLOGctrace7(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE7)
+#define APLOGctrace8(c) APLOG_C_IS_LEVEL(c,APLOG_TRACE8)
extern int AP_DECLARE_DATA ap_default_loglevel;
@@ -278,8 +278,8 @@ void ap_logs_child_init(apr_pool_t *p, s
/* need additional step to expand APLOG_MARK first */
#define ap_log_error(...) ap_log_error__(__VA_ARGS__)
#define ap_log_error__(file, line, mi, level, status, s, ...) \
- do { server_rec *sr = s; if (APLOG_MODULE_IS_LEVEL(sr, mi, level)) \
- ap_log_error_(file, line, mi, level, status, sr, __VA_ARGS__); \
+ do { if (APLOG_MODULE_IS_LEVEL(s, mi, level)) \
+ ap_log_error_(file, line, mi, level, status, s, __VA_ARGS__); \
} while(0)
#else
#define ap_log_error ap_log_error_