You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@apache.org on 2001/02/04 04:00:16 UTC
cvs commit: httpd-2.0/include http_config.h http_connection.h http_core.h http_log.h http_protocol.h http_request.h
dougm 01/02/03 19:00:16
Modified: include http_config.h http_connection.h http_core.h
http_log.h http_protocol.h http_request.h
Log:
fix minor prototype inconsistencies noticed with C::Scan
Revision Changes Path
1.63 +9 -9 httpd-2.0/include/http_config.h
Index: http_config.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- http_config.h 2001/01/29 22:29:22 1.62
+++ http_config.h 2001/02/04 03:00:14 1.63
@@ -469,8 +469,8 @@
* @return An error string or NULL on success
* @deffunc const char *ap_set_string_slot(cmd_parms *cmd, void *struct_ptr, const char *arg)
*/
-AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *, void *,
- const char *);
+AP_DECLARE_NONSTD(const char *) ap_set_string_slot(cmd_parms *cmd, void *struct_ptr,
+ const char *arg);
/**
* Return true if the specified method is limited by being listed in
@@ -494,8 +494,8 @@
* @return An error string or NULL on success
* @deffunc const char *ap_set_string_slot_lower(cmd_parms *cmd, void *struct_ptr, const char *arg)
*/
-AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *,
- void *, const char *);
+AP_DECLARE_NONSTD(const char *) ap_set_string_slot_lower(cmd_parms *cmd,
+ void *struct_ptr, const char *arg);
/**
* Generic command handling function for flags
* @param cmd The command parameters for this directive
@@ -504,7 +504,7 @@
* @return An error string or NULL on success
* @deffunc const char *ap_set_flag_slot(cmd_parms *cmd, void *struct_ptr, int arg)
*/
-AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *, void *, int);
+AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *cmd, void *struct_ptr, int arg);
/**
* Generic command handling function for files
* @param cmd The command parameters for this directive
@@ -513,7 +513,7 @@
* @return An error string or NULL on success
* @deffunc const char *ap_set_file_slot(cmd_parms *cmd, void *struct_ptr, const char *arg)
*/
-AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *, void *, const char *);
+AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, void *struct_ptr, const char *arg);
/**
* For modules which need to read config files, open logs, etc. ...
@@ -589,7 +589,7 @@
* @param name the name of the file to open
* @deffunc apr_status_t ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name)
*/
-AP_DECLARE(apr_status_t) ap_pcfg_openfile(configfile_t **, apr_pool_t *p, const char *name);
+AP_DECLARE(apr_status_t) ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name);
/**
* Allocate a configfile_t handle with user defined functions and params
@@ -951,7 +951,7 @@
* @return OK or DECLINED
* @deffunc int ap_run_header_parser(request_rec *r)
*/
-AP_DECLARE_HOOK(int,header_parser,(request_rec *))
+AP_DECLARE_HOOK(int,header_parser,(request_rec *r))
/**
* Run the pre_config function for each module
@@ -999,7 +999,7 @@
* @tip non-wildcard handlers should HOOK_MIDDLE, wildcard HOOK_LAST
* @deffunc void ap_run_handler(request_rec *r)
*/
-AP_DECLARE_HOOK(int,handler,(request_rec *))
+AP_DECLARE_HOOK(int,handler,(request_rec *r))
/**
* Retrieve the optional functions for each module.
1.32 +2 -2 httpd-2.0/include/http_connection.h
Index: http_connection.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_connection.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- http_connection.h 2001/01/19 22:32:15 1.31
+++ http_connection.h 2001/02/04 03:00:14 1.32
@@ -129,7 +129,7 @@
* @return OK or DECLINED
* @deffunc int ap_run_pre_connection(conn_rec *c)
*/
-AP_DECLARE_HOOK(int,pre_connection,(conn_rec *))
+AP_DECLARE_HOOK(int,pre_connection,(conn_rec *c))
/**
* This hook implements different protocols. After a connection has been
@@ -140,7 +140,7 @@
* @return OK or DECLINED
* @deffunc int ap_run_process_connection(conn_rec *c)
*/
-AP_DECLARE_HOOK(int,process_connection,(conn_rec *))
+AP_DECLARE_HOOK(int,process_connection,(conn_rec *c))
#ifdef __cplusplus
}
1.38 +7 -7 httpd-2.0/include/http_core.h
Index: http_core.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_core.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- http_core.h 2001/01/31 18:56:35 1.37
+++ http_core.h 2001/02/04 03:00:14 1.38
@@ -137,21 +137,21 @@
* @return the Options bitmask
* @deffunc int ap_allow_options(request_rec *r)
*/
-AP_DECLARE(int) ap_allow_options (request_rec *);
+AP_DECLARE(int) ap_allow_options (request_rec *r);
/**
* Retrieve the value of the AllowOverride for this request
* @param r The current request
* @return the overrides bitmask
* @deffunc int ap_allow_overrides(request_rec *r)
*/
-AP_DECLARE(int) ap_allow_overrides (request_rec *);
+AP_DECLARE(int) ap_allow_overrides (request_rec *r);
/**
* Retrieve the value of the DefaultType directive, or text/plain if not set
* @param r The current request
* @return The default type
* @deffunc const char *ap_default_type(request_rec *r)
*/
-AP_DECLARE(const char *) ap_default_type (request_rec *);
+AP_DECLARE(const char *) ap_default_type (request_rec *r);
/**
* Retrieve the document root for this server
* @param r The current request
@@ -160,7 +160,7 @@
* @return The document root
* @deffunc const char *ap_document_root(request_rec *r)
*/
-AP_DECLARE(const char *) ap_document_root (request_rec *);
+AP_DECLARE(const char *) ap_document_root (request_rec *r);
/**
* Lookup the remote client's DNS name or IP address
* @param conn The current connection
@@ -274,14 +274,14 @@
* @return The authorization required
* @deffunc const char *ap_auth_type(request_rec *r)
*/
-AP_DECLARE(const char *) ap_auth_type (request_rec *);
+AP_DECLARE(const char *) ap_auth_type (request_rec *r);
/**
* Return the current Authorization realm
* @param r The current request
* @return The current authorization realm
* @deffunc const char *ap_auth_name(request_rec *r)
*/
-AP_DECLARE(const char *) ap_auth_name (request_rec *);
+AP_DECLARE(const char *) ap_auth_name (request_rec *r);
/**
* How the requires lines must be met.
* @param r The current request
@@ -300,7 +300,7 @@
* @return An array of all requires directives for this request
* @deffunc const apr_array_header_t *ap_requires(request_rec *r)
*/
-AP_DECLARE(const apr_array_header_t *) ap_requires (request_rec *);
+AP_DECLARE(const apr_array_header_t *) ap_requires (request_rec *r);
#if defined(WIN32)
/*
1.24 +2 -2 httpd-2.0/include/http_log.h
Index: http_log.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_log.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- http_log.h 2001/01/18 23:52:02 1.23
+++ http_log.h 2001/02/04 03:00:15 1.24
@@ -213,7 +213,7 @@
* @param s The current server
* @deffunc void ap_error_log2stderr(server_rec *s)
*/
-AP_DECLARE(void) ap_error_log2stderr (server_rec *);
+AP_DECLARE(void) ap_error_log2stderr (server_rec *s);
/**
* Log the current pid of the parent process
@@ -257,7 +257,7 @@
* @param pl The piped log structure
* @deffunc void ap_close_piped_log(piped_log *pl)
*/
-AP_DECLARE(void) ap_close_piped_log (piped_log *);
+AP_DECLARE(void) ap_close_piped_log (piped_log *pl);
/**
* A macro to access the read side of the piped log pipe
1.50 +4 -4 httpd-2.0/include/http_protocol.h
Index: http_protocol.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_protocol.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- http_protocol.h 2001/01/27 17:59:02 1.49
+++ http_protocol.h 2001/02/04 03:00:15 1.50
@@ -527,7 +527,7 @@
* @return OK or DECLINED
* @deffunc ap_run_post_read_request(request_rec *r)
*/
-AP_DECLARE_HOOK(int,post_read_request,(request_rec *))
+AP_DECLARE_HOOK(int,post_read_request,(request_rec *r))
/**
* This hook allows modules to perform any module-specific logging activities
* over and above the normal server things.
@@ -535,7 +535,7 @@
* @return OK, DECLINED, or HTTP_...
* @deffunc int ap_run_log_transaction(request_rec *r)
*/
-AP_DECLARE_HOOK(int,log_transaction,(request_rec *))
+AP_DECLARE_HOOK(int,log_transaction,(request_rec *r))
/**
* This hook allows modules to retrieve the http method from a request. This
* allows Apache modules to easily extend the methods that Apache understands
@@ -543,14 +543,14 @@
* @return The http method from the request
* @deffunc const char *ap_run_http_method(const request_rec *r)
*/
-AP_DECLARE_HOOK(const char *,http_method,(const request_rec *))
+AP_DECLARE_HOOK(const char *,http_method,(const request_rec *r))
/**
* Return the default port from the current request
* @param r The current request
* @return The current port
* @deffunc apr_port_t ap_run_default_port(const request_rec *r)
*/
-AP_DECLARE_HOOK(apr_port_t,default_port,(const request_rec *))
+AP_DECLARE_HOOK(apr_port_t,default_port,(const request_rec *r))
typedef struct ap_bucket_error ap_bucket_error;
/**
1.23 +7 -7 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- http_request.h 2001/01/29 22:29:23 1.22
+++ http_request.h 2001/02/04 03:00:15 1.23
@@ -249,7 +249,7 @@
* @return OK, DECLINED, or HTTP_...
* @deffunc int ap_run_translate_name(request_rec *r)
*/
-AP_DECLARE_HOOK(int,translate_name,(request_rec *))
+AP_DECLARE_HOOK(int,translate_name,(request_rec *r))
/**
* This hook allows modules to check the authentication information sent with
@@ -258,7 +258,7 @@
* @return OK, DECLINED, or HTTP_...
* @deffunc int ap_run_check_user_id(request_rec *r)
*/
-AP_DECLARE_HOOK(int,check_user_id,(request_rec *))
+AP_DECLARE_HOOK(int,check_user_id,(request_rec *r))
/**
* Allows modules to perform module-specific fixing of header fields. This
@@ -267,7 +267,7 @@
* @return OK, DECLINED, or HTTP_...
* @deffunc int ap_run_fixups(request_rec *r)
*/
-AP_DECLARE_HOOK(int,fixups,(request_rec *))
+AP_DECLARE_HOOK(int,fixups,(request_rec *r))
/**
* This routine is called to determine and/or set the various document type
@@ -277,7 +277,7 @@
* @return OK, DECLINED, or HTTP_...
* @deffunc int ap_run_type_checker(request_rec *r)
*/
-AP_DECLARE_HOOK(int,type_checker,(request_rec *))
+AP_DECLARE_HOOK(int,type_checker,(request_rec *r))
/**
* This routine is called to check for any module-specific restrictions placed
@@ -286,7 +286,7 @@
* @return OK, DECLINED, or HTTP_...
* @deffunc int ap_run_access_checker(request_rec *r)
*/
-AP_DECLARE_HOOK(int,access_checker,(request_rec *))
+AP_DECLARE_HOOK(int,access_checker,(request_rec *r))
/**
* This routine is called to check to see if the resource being requested
@@ -295,14 +295,14 @@
* @return OK, DECLINED, or HTTP_...
* @deffunc int ap_run_auth_checker(request_rec *r)
*/
-AP_DECLARE_HOOK(int,auth_checker,(request_rec *))
+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)
*/
-AP_DECLARE_HOOK(void,insert_filter,(request_rec *))
+AP_DECLARE_HOOK(void,insert_filter,(request_rec *r))
#ifdef __cplusplus
}