diff options
| author | Ben Laurie <ben@apache.org> | 2000-06-17 18:29:53 +0200 |
|---|---|---|
| committer | Ben Laurie <ben@apache.org> | 2000-06-17 18:29:53 +0200 |
| commit | c0a4cb787356028a11170db449f9a7d2f8237885 (patch) | |
| tree | fc196bbfba8c2d7329746663b7d2f4635b4bad74 /include | |
| parent | Constification. (diff) | |
| download | apache2-c0a4cb787356028a11170db449f9a7d2f8237885.tar.xz apache2-c0a4cb787356028a11170db449f9a7d2f8237885.zip | |
More consification, correct command initialisation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85599 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_listen.h | 19 | ||||
| -rw-r--r-- | include/httpd.h | 7 |
2 files changed, 16 insertions, 10 deletions
diff --git a/include/ap_listen.h b/include/ap_listen.h index d611c2953e..011677c439 100644 --- a/include/ap_listen.h +++ b/include/ap_listen.h @@ -73,16 +73,17 @@ extern ap_listen_rec *ap_listeners; void ap_listen_pre_config(void); int ap_listen_open(process_rec *process, unsigned port); -const char *ap_set_listenbacklog(cmd_parms *cmd, void *dummy, char *arg); -const char *ap_set_listener(cmd_parms *cmd, void *dummy, char *ips); -const char *ap_set_send_buffer_size(cmd_parms *cmd, void *dummy, char *arg); +const char *ap_set_listenbacklog(cmd_parms *cmd, void *dummy, const char *arg); +const char *ap_set_listener(cmd_parms *cmd, void *dummy, const char *ips); +const char *ap_set_send_buffer_size(cmd_parms *cmd, void *dummy, + const char *arg); #define LISTEN_COMMANDS \ -{ "ListenBacklog", ap_set_listenbacklog, NULL, RSRC_CONF, TAKE1, \ - "Maximum length of the queue of pending connections, as used by listen(2)" }, \ -{ "Listen", ap_set_listener, NULL, RSRC_CONF, TAKE1, \ - "A port number or a numeric IP address and a port number"}, \ -{ "SendBufferSize", ap_set_send_buffer_size, NULL, RSRC_CONF, TAKE1, \ - "Send buffer size in bytes"}, +AP_INIT_TAKE1("ListenBacklog", ap_set_listenbacklog, NULL, RSRC_CONF, \ + "Maximum length of the queue of pending connections, as used by listen(2)"), \ +AP_INIT_TAKE1("Listen", ap_set_listener, NULL, RSRC_CONF, \ + "A port number or a numeric IP address and a port number"), \ +AP_INIT_TAKE1("SendBufferSize", ap_set_send_buffer_size, NULL, RSRC_CONF, \ + "Send buffer size in bytes"), #endif diff --git a/include/httpd.h b/include/httpd.h index 9ad14cba1f..c476da6e3c 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -931,7 +931,7 @@ API_EXPORT(char *) ap_getword_nulls(ap_pool_t *p, const char **line, char stop); API_EXPORT(char *) ap_getword_nulls_nc(ap_pool_t *p, char **line, char stop); API_EXPORT(char *) ap_getword_conf(ap_pool_t *p, const char **line); API_EXPORT(char *) ap_getword_conf_nc(ap_pool_t *p, char **line); -API_EXPORT(char *) ap_resolve_env(ap_pool_t *p, const char * word); +API_EXPORT(const char *) ap_resolve_env(ap_pool_t *p, const char * word); API_EXPORT(const char *) ap_size_list_item(const char **field, int *len); API_EXPORT(char *) ap_get_list_item(ap_pool_t *p, const char **field); @@ -1050,13 +1050,18 @@ API_EXPORT(extern const char *) ap_psignature(const char *prefix, request_rec *r */ #ifdef AP_DEBUG +# define strchr(s, c) ap_strchr(s,c) # define strrchr(s, c) ap_strrchr(s,c) +char *ap_strchr(char *s, int c); +const char *ap_strchr_c(const char *s, int c); char *ap_strrchr(char *s, int c); const char *ap_strrchr_c(const char *s, int c); #else +# define ap_strchr(s, c) strchr(s, c) +# define ap_strchr_c(s, c) strchr(s, c) # define ap_strrchr(s, c) strrchr(s, c) # define ap_strrchr_c(s, c) strrchr(s, c) |