You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by po...@apache.org on 2009/11/03 15:59:24 UTC
svn commit: r832442 - in /httpd/httpd/trunk: docs/doxygen.conf
include/http_config.h include/util_cfgtree.h modules/core/mod_watchdog.h
modules/generators/mod_cgi.h
Author: poirier
Date: Tue Nov 3 14:59:24 2009
New Revision: 832442
URL: http://svn.apache.org/viewvc?rev=832442&view=rev
Log:
Fix remaining doxygen warnings. "make dox" is now clean with doxygen
version 1.5.8.
PR: 48093
Submitted by: Brad Hards
Reviewed by: poirier
Modified:
httpd/httpd/trunk/docs/doxygen.conf
httpd/httpd/trunk/include/http_config.h
httpd/httpd/trunk/include/util_cfgtree.h
httpd/httpd/trunk/modules/core/mod_watchdog.h
httpd/httpd/trunk/modules/generators/mod_cgi.h
Modified: httpd/httpd/trunk/docs/doxygen.conf
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/doxygen.conf?rev=832442&r1=832441&r2=832442&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/doxygen.conf (original)
+++ httpd/httpd/trunk/docs/doxygen.conf Tue Nov 3 14:59:24 2009
@@ -24,6 +24,7 @@
"APR_DECLARE_NONSTD(x)=x" \
"AP_DECLARE_HOOK(ret,name,args)=ret name args;" \
"APR_DECLARE_OPTIONAL_FN(ret,name,args)=ret name args;" \
+ "APR_DECLARE_EXTERNAL_HOOK(ns,link,ret,name,args)= ret ns##_hook_##name args;" \
"AP_DECLARE(x)=x" \
"AP_DECLARE_NONSTD(x)=x" \
AP_CORE_DECLARE(x)=x \
Modified: httpd/httpd/trunk/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=832442&r1=832441&r2=832442&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_config.h (original)
+++ httpd/httpd/trunk/include/http_config.h Tue Nov 3 14:59:24 2009
@@ -335,7 +335,8 @@
void *dynamic_load_handle;
/** A pointer to the next module in the list
- * @var module_struct *next */
+ * @var module_struct *next
+ */
struct module_struct *next;
/** Magic Cookie to identify a module structure; It's mainly
@@ -731,28 +732,28 @@
/**
* The topmost module in the list
- * @defvar module *ap_top_module
+ * @var module *ap_top_module
*/
AP_DECLARE_DATA extern module *ap_top_module;
/**
* Array of all statically linked modules
- * @defvar module *ap_prelinked_modules[]
+ * @var module *ap_prelinked_modules[]
*/
AP_DECLARE_DATA extern module *ap_prelinked_modules[];
/**
* Array of all statically linked modulenames (symbols)
- * @defvar ap_module_symbol_t ap_prelinked_modulenames[]
+ * @var ap_module_symbol_t ap_prelinked_module_symbols[]
*/
AP_DECLARE_DATA extern ap_module_symbol_t ap_prelinked_module_symbols[];
/**
* Array of all preloaded modules
- * @defvar module *ap_preloaded_modules[]
+ * @var module *ap_preloaded_modules[]
*/
AP_DECLARE_DATA extern module *ap_preloaded_modules[];
/**
* Array of all loaded modules
- * @defvar module **ap_loaded_modules
+ * @var module **ap_loaded_modules
*/
AP_DECLARE_DATA extern module **ap_loaded_modules;
Modified: httpd/httpd/trunk/include/util_cfgtree.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_cfgtree.h?rev=832442&r1=832441&r2=832442&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_cfgtree.h (original)
+++ httpd/httpd/trunk/include/util_cfgtree.h Tue Nov 3 14:59:24 2009
@@ -68,7 +68,6 @@
/**
* The root of the configuration tree
- * @var ap_directive_t *conftree
*/
AP_DECLARE_DATA extern ap_directive_t *ap_conftree;
Modified: httpd/httpd/trunk/modules/core/mod_watchdog.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.h?rev=832442&r1=832441&r2=832442&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.h (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.h Tue Nov 3 14:59:24 2009
@@ -23,7 +23,7 @@
*
* @defgroup MOD_WATCHDOG watchdog
* @ingroup APACHE_MODS
- * @{
+ * \@{
*/
#include "httpd.h"
@@ -162,10 +162,10 @@
/**
* Watchdog require hook.
+ * @param s The server record
* @param name Watchdog name.
* @param parent Non-zero to indicate the parent process watchdog mode.
* @param singleton Non-zero to indicate the singleton watchdog mode.
- * @param pool The pool used to create the watchdog.
* @return OK to enable notifications from this watchdog, DECLINED otherwise.
* @remark This is called in post config phase for all watchdog instances
* that have no callbacks registered. Modules using this hook
@@ -180,6 +180,7 @@
/**
* Watchdog initialize hook.
* It is called after the watchdog thread is initialized.
+ * @param s The server record
* @param name Watchdog name.
* @param pool The pool used to create the watchdog.
*/
@@ -191,6 +192,7 @@
/**
* Watchdog terminate hook.
* It is called when the watchdog thread is terminated.
+ * @param s The server record
* @param name Watchdog name.
* @param pool The pool used to create the watchdog.
*/
@@ -202,6 +204,7 @@
/**
* Fixed interval watchdog hook.
* It is called regularly on @p AP_WD_TM_INTERVAL interval.
+ * @param s The server record
* @param name Watchdog name.
* @param pool Temporary pool destroyed after the call.
*/
@@ -215,4 +218,4 @@
#endif
#endif /* MOD_WATCHDOG_H */
-/** @} */
+/** \@} */
Modified: httpd/httpd/trunk/modules/generators/mod_cgi.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgi.h?rev=832442&r1=832441&r2=832442&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgi.h (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgi.h Tue Nov 3 14:59:24 2009
@@ -51,8 +51,6 @@
* @param argv Pointer to the arguments to pass (may be overridden)
* @param r The current request
* @param p The pool to allocate correct cmd/argv elements within.
- * @param process_cgi Set true if processing r->filename and r->args
- * as a CGI invocation, otherwise false
* @param e_info pass e_info.cmd_type (Set to APR_SHELLCMD or APR_PROGRAM on entry)
and e_info.detached (Should the child start in detached state?)
* @remark This callback may be registered by the os-specific module