ben 01/03/13 14:20:58
Modified: docs doxygen.conf
include ap_config.h http_request.h
Log:
Check in not-quite-working hooks groupings.
Revision Changes Path
1.3 +2 -1 httpd-2.0/docs/doxygen.conf
Index: doxygen.conf
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/doxygen.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- doxygen.conf 2001/03/11 23:24:56 1.2
+++ doxygen.conf 2001/03/13 22:20:50 1.3
@@ -10,7 +10,8 @@
EXPAND_ONLY_PREDEF=YES
EXPAND_AS_DEFINED=AP_DECLARE
# not sure why this doesn't work as EXPAND_AS_DEFINED, it should!
-PREDEFINED=APR_DECLARE(x)=x APR_DECLARE_NONSTD(x)=x
+PREDEFINED=APR_DECLARE(x)=x APR_DECLARE_NONSTD(x)=x \
+ AP_DECLARE_HOOK(ret,name,args)="ret name args"
OPTIMIZE_OUTPUT_FOR_C=YES
1.59 +5 -1 httpd-2.0/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/ap_config.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ap_config.h 2001/02/24 03:40:47 1.58
+++ ap_config.h 2001/03/13 22:20:54 1.59
@@ -59,8 +59,12 @@
#include "apr_hooks.h"
/**
- * @package Symbol Export Macros
+ * @file ap_config.h
+ * @brief Symbol Export Macros
*/
+
+/* Although this file doesn't declare any hooks, declare the hook group here */
+/** @defgroup hooks Apache Hooks */
/**
* AP_DECLARE_EXPORT is defined when building the Apache Core dynamic
1.26 +15 -9 httpd-2.0/include/http_request.h
Index: http_request.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_request.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- http_request.h 2001/03/05 04:43:55 1.25
+++ http_request.h 2001/03/13 22:20:55 1.26
@@ -67,7 +67,8 @@
#endif
/**
- * @package Apache Request library
+ * @file http_request.h
+ * @brief Apache Request library
*/
/* http_request.c is the code which handles the main line of request
@@ -240,14 +241,19 @@
AP_DECLARE(void) ap_die(int type, request_rec *r);
#endif
- /* Hooks */
+/* Hooks */
+
+/* XXX: doxygen grouping doesn't appear to work, but it should. Checking with
+ * doxygen (Ben).
+ */
+
/**
* This hook allow modules an opportunity to translate the URI into an
* actual filename. If no modules do anything special, the server's default
* rules will be followed.
* @param r The current request
* @return OK, DECLINED, or HTTP_...
- * @deffunc int ap_run_translate_name(request_rec *r)
+ * @ingroup hooks
*/
AP_DECLARE_HOOK(int,translate_name,(request_rec *r))
@@ -256,7 +262,7 @@
* the request.
* @param r The current request
* @return OK, DECLINED, or HTTP_...
- * @deffunc int ap_run_check_user_id(request_rec *r)
+ * @ingroup hooks
*/
AP_DECLARE_HOOK(int,check_user_id,(request_rec *r))
@@ -265,7 +271,7 @@
* is invoked just before any content-handler
* @param r The current request
* @return OK, DECLINED, or HTTP_...
- * @deffunc int ap_run_fixups(request_rec *r)
+ * @ingroup hooks
*/
AP_DECLARE_HOOK(int,fixups,(request_rec *r))
@@ -275,7 +281,7 @@
* cetera.
* @param r the current request
* @return OK, DECLINED, or HTTP_...
- * @deffunc int ap_run_type_checker(request_rec *r)
+ * @ingroup hooks
*/
AP_DECLARE_HOOK(int,type_checker,(request_rec *r))
@@ -284,7 +290,7 @@
* upon the requested resource.
* @param r the current request
* @return OK, DECLINED, or HTTP_...
- * @deffunc int ap_run_access_checker(request_rec *r)
+ * @ingroup hooks
*/
AP_DECLARE_HOOK(int,access_checker,(request_rec *r))
@@ -293,14 +299,14 @@
* requires authorisation.
* @param r the current request
* @return OK, DECLINED, or HTTP_...
- * @deffunc int ap_run_auth_checker(request_rec *r)
+ * @ingroup hooks
*/
AP_DECLARE_HOOK(int,auth_checker,(request_rec *r))
/**
* This hook allows modules to insert filters for the current request
* @param r the current request
- * @deffunc void ap_run_insert_filter(request_rec *r)
+ * @ingroup hooks
*/
AP_DECLARE_HOOK(void,insert_filter,(request_rec *r))
|