From 294165b5a79031abad7e3f7dc2dbb9cb43f53f8a Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Mon, 30 May 2016 20:19:41 +0000 Subject: [PATCH] Fix some doxygen warning. Make the use of 'pfds' and 'pds' consistent git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1746189 13f79535-47bb-0310-9956-ffa450edef68 --- include/ap_mpm.h | 5 +---- server/mpm_common.c | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/ap_mpm.h b/include/ap_mpm.h index d844a02c89..633ea1faac 100644 --- a/include/ap_mpm.h +++ b/include/ap_mpm.h @@ -211,7 +211,6 @@ AP_DECLARE(apr_status_t) ap_mpm_register_timed_callback( * Register a callback on the readability or writability on a group of * sockets/pipes. * @param pfds Array of apr_pollfd_t - * @param p pool for use between registration and callback * @param cbfn The callback function * @param baton userdata for the callback function * @return APR_SUCCESS if all sockets/pipes could be added to a pollset, @@ -220,14 +219,13 @@ AP_DECLARE(apr_status_t) ap_mpm_register_timed_callback( * from the pollset and only 1 callback is issued. */ -AP_DECLARE(apr_status_t) ap_mpm_register_poll_callback(apr_array_header_t *pds, +AP_DECLARE(apr_status_t) ap_mpm_register_poll_callback(apr_array_header_t *pfds, ap_mpm_callback_fn_t *cbfn, void *baton); /** * Register a callback on the readability or writability on a group of sockets/pipes, * with a timeout. * @param pfds Array of apr_pollfd_t - * @param p pool for use between registration and callback * @param cbfn The callback function * @param tofn The callback function if the timeout expires * @param baton userdata for the callback function @@ -247,7 +245,6 @@ AP_DECLARE(apr_status_t) ap_mpm_register_poll_callback_timeout( /** * Unregister a previously registered callback. * @param pfds Array of apr_pollfd_t -* @param p pool for use between registration and callback * @return APR_SUCCESS if all sockets/pipes could be removed from the pollset, * APR_ENOTIMPL if no asynch support, or an apr_pollset_remove error. * @remark This function triggers the cleanup registered on the pool p during diff --git a/server/mpm_common.c b/server/mpm_common.c index ed003f74a5..43194e7ba0 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -568,24 +568,24 @@ AP_DECLARE(apr_status_t) ap_mpm_register_timed_callback(apr_time_t t, return ap_run_mpm_register_timed_callback(t, cbfn, baton); } -AP_DECLARE(apr_status_t) ap_mpm_register_poll_callback(apr_array_header_t *pds, +AP_DECLARE(apr_status_t) ap_mpm_register_poll_callback(apr_array_header_t *pfds, ap_mpm_callback_fn_t *cbfn, void *baton) { - return ap_run_mpm_register_poll_callback(pds, cbfn, baton); + return ap_run_mpm_register_poll_callback(pfds, cbfn, baton); } AP_DECLARE(apr_status_t) ap_mpm_register_poll_callback_timeout( - apr_array_header_t *pds, ap_mpm_callback_fn_t *cbfn, + apr_array_header_t *pfds, ap_mpm_callback_fn_t *cbfn, ap_mpm_callback_fn_t *tofn, void *baton, apr_time_t timeout) { - return ap_run_mpm_register_poll_callback_timeout(pds, cbfn, tofn, baton, + return ap_run_mpm_register_poll_callback_timeout(pfds, cbfn, tofn, baton, timeout); } AP_DECLARE(apr_status_t) ap_mpm_unregister_poll_callback( - apr_array_header_t *pds) + apr_array_header_t *pfds) { - return ap_run_mpm_unregister_poll_callback(pds); + return ap_run_mpm_unregister_poll_callback(pfds); } AP_DECLARE(const char *)ap_show_mpm(void) -- 2.50.1