Use correct Doxygen keywords for functions and variables. TODO: figure out whether those keywords are actually necessary. HTML-ify some documentation comments for benefit of Doxygen.

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

1 files changed, 8 insertions, 8 deletions

diff --git a/include/util_script.h b/include/util_script.h
index bd5c7f267f..44ea7f3df8 100644
--- a/include/util_script.h
+++ b/include/util_script.h
@@ -46,7 +46,7 @@ extern "C" {
  * @param t Apache table of key-value pairs
  * @return An array containing the same key-value pairs suitable for
  *         use with an exec call.
- * @deffunc char **ap_create_environment(apr_pool_t *p, apr_table_t *t)
+ * @fn char **ap_create_environment(apr_pool_t *p, apr_table_t *t)
  */
 AP_DECLARE(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t);
 
@@ -57,7 +57,7 @@ AP_DECLARE(char **) ap_create_environment(apr_pool_t *p, apr_table_t *t);
  * @param uri The uri we are currently parsing
  * @param path_info The current path info
  * @return The length of the path info
- * @deffunc int ap_find_path_info(const char *uri, const char *path_info)
+ * @fn int ap_find_path_info(const char *uri, const char *path_info)
  */
 AP_DECLARE(int) ap_find_path_info(const char *uri, const char *path_info);
 
@@ -65,14 +65,14 @@ AP_DECLARE(int) ap_find_path_info(const char *uri, const char *path_info);
  * Add CGI environment variables required by HTTP/1.1 to the request's 
  * environment table
  * @param r the current request
- * @deffunc void ap_add_cgi_vars(request_rec *r)
+ * @fn void ap_add_cgi_vars(request_rec *r)
  */
 AP_DECLARE(void) ap_add_cgi_vars(request_rec *r);
 
 /**
  * Add common CGI environment variables to the requests environment table
  * @param r The current request
- * @deffunc void ap_add_common_vars(request_rec *r)
+ * @fn void ap_add_common_vars(request_rec *r)
  */
 AP_DECLARE(void) ap_add_common_vars(request_rec *r);
 
@@ -85,7 +85,7 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r);
  * @param buffer Empty when calling the function.  On output, if there was an
  *               error, the string that cause the error is stored here. 
  * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- * @deffunc int ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer)
+ * @fn int ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer)
  */ 
 AP_DECLARE(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *buffer);
 
@@ -98,7 +98,7 @@ AP_DECLARE(int) ap_scan_script_header_err(request_rec *r, apr_file_t *f, char *b
  * @param buffer Empty when calling the function.  On output, if there was an
  *               error, the string that cause the error is stored here. 
  * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- * @deffunc int ap_scan_script_header_err_brigade(request_rec *r, apr_bucket_brigade *bb, char *buffer)
+ * @fn int ap_scan_script_header_err_brigade(request_rec *r, apr_bucket_brigade *bb, char *buffer)
  */ 
 AP_DECLARE(int) ap_scan_script_header_err_brigade(request_rec *r,
                                                   apr_bucket_brigade *bb,
@@ -116,7 +116,7 @@ AP_DECLARE(int) ap_scan_script_header_err_brigade(request_rec *r,
  * @param args   String arguments to parse consecutively for headers, 
  *               a NULL argument terminates the list.
  * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- * @deffunc int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char *, int, void *), void *getsfunc_data)
+ * @fn int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char *, int, void *), void *getsfunc_data)
  */ 
 AP_DECLARE_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r, 
                                                       char *buffer, 
@@ -134,7 +134,7 @@ AP_DECLARE_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r,
                    act like gets()
  * @param getsfunc_data The place to read from
  * @return HTTP_OK on success, HTTP_INTERNAL_SERVER_ERROR otherwise
- * @deffunc int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char *, int, void *), void *getsfunc_data)
+ * @fn int ap_scan_script_header_err_core(request_rec *r, char *buffer, int (*getsfunc)(char *, int, void *), void *getsfunc_data)
  */ 
 AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
 				       int (*getsfunc) (char *, int, void *),