From: Jeff Trawick Date: Tue, 13 Aug 2013 12:36:27 +0000 (+0000) Subject: fix Doxygen warnings/comments X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b55ffccf20db36e2fc145050341ef36ee6ddb61;p=thirdparty%2Fapache%2Fhttpd.git fix Doxygen warnings/comments git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1513461 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/ap_mpm.h b/include/ap_mpm.h index 6b345ed6ae4..9fca65dc712 100644 --- a/include/ap_mpm.h +++ b/include/ap_mpm.h @@ -178,7 +178,7 @@ AP_DECLARE(apr_status_t) ap_mpm_register_timed_callback(apr_time_t t, * APR_ENOTIMPL if no asynch support, or an apr_pollset_add error. * @remark When activity is found on any 1 socket in the list, all are removed * from the pollset and only 1 callback is issued. - * @fn apr_status_t (p_mpm_register_socket_callback(apr_socket_t **s, apr_pool_t *p, int for_read, ap_mpm_callback_fn_t *cbfn, void *baton) + * @fn apr_status_t ap_mpm_register_socket_callback(apr_socket_t **s, apr_pool_t *p, int for_read, ap_mpm_callback_fn_t *cbfn, void *baton) */ AP_DECLARE(apr_status_t) ap_mpm_register_socket_callback(apr_socket_t **s, diff --git a/include/http_log.h b/include/http_log.h index 0309bdeefb7..a71df8e2cb4 100644 --- a/include/http_log.h +++ b/include/http_log.h @@ -692,6 +692,7 @@ AP_DECLARE(void) ap_log_cdata_(const char *file, int line, int module_index, * @param module_index The module_index of the module logging this buffer * @param level The log level * @param c The connection which we are logging for + * @param s The server which we are logging for * @param label A label for the buffer, to be logged preceding the buffer * @param data The buffer to be logged * @param len The length of the buffer diff --git a/include/httpd.h b/include/httpd.h index 9ee3aa40182..175c7d867f6 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -2308,7 +2308,6 @@ AP_DECLARE(void) ap_bin2hex(const void *src, apr_size_t srclen, char *dest) /** * Check if string contains a control character * @param str the string to check - * @param srclen length of the data * @return 1 if yes, 0 if no control characters */ AP_DECLARE(int) ap_has_cntrl(const char *str) diff --git a/include/mpm_common.h b/include/mpm_common.h index 8ba20d2ce23..76bb59488d2 100644 --- a/include/mpm_common.h +++ b/include/mpm_common.h @@ -287,7 +287,7 @@ typedef enum { AP_MPM_PODX_NORESTART, AP_MPM_PODX_RESTART, AP_MPM_PODX_GRACEFUL /** * Open the extended pipe-of-death. * @param p The pool to use for allocating the pipe - * @param pod the pipe-of-death that is created. + * @param pod The pipe-of-death that is created. */ AP_DECLARE(apr_status_t) ap_mpm_podx_open(apr_pool_t *p, ap_pod_t **pod); @@ -299,7 +299,7 @@ AP_DECLARE(int) ap_mpm_podx_check(ap_pod_t *pod); /** * Close the pipe-of-death * - * @param extended pod the pipe-of-death to close. + * @param pod The pipe-of-death to close. */ AP_DECLARE(apr_status_t) ap_mpm_podx_close(ap_pod_t *pod); diff --git a/include/util_varbuf.h b/include/util_varbuf.h index cf4bc7ffe3e..32859392647 100644 --- a/include/util_varbuf.h +++ b/include/util_varbuf.h @@ -22,7 +22,7 @@ * usage is with NUL-terminated strings, most functions also work with * arbitrary binary data. * - * @defgroup APACHE_CORE_VARBUF + * @defgroup APACHE_CORE_VARBUF Variable length buffer library * @ingroup APACHE_CORE * @{ */ @@ -168,7 +168,7 @@ AP_DECLARE(apr_status_t) ap_varbuf_regsub(struct ap_varbuf *vb, /** Read a line from an ap_configfile_t and append it to an ap_varbuf. * @param vb pointer to the ap_varbuf struct - * @param cfg pointer to the ap_configfile_t + * @param cfp pointer to the ap_configfile_t * @param max_len maximum line length, including leading/trailing whitespace * @return see ap_cfg_getline() * @note vb->strlen will be set to the length of the line