Fix some issues found by Ruediger Pluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953125 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_config.h b/include/http_config.h
index 92c0812a5614d3d7597242393cc2fe9bda54e2df..6c2eebf90f41f5c817a483539511ce4c7cbe5056 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -511,7 +511,6 @@ AP_DECLARE(int) ap_get_request_module_loglevel(const request_rec *r, int index);
  * @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);

diff --git a/include/http_log.h b/include/http_log.h
index e296bedc32f45e81f2ee9323e5c68d9207398491..347d7342e69055f7782c5f243d66f9fdc3ccd818 100644 (file)
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -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, server_rec *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_