From 8db6090ae20f4da2fcaaa1bcb1a1ed01d6d04e1a Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Sun, 18 Jun 2000 21:01:21 +0000 Subject: [PATCH] Use the new command-handler initializer macros in mod_access; clean up the resulting warnings. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85611 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/mod_access.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/aaa/mod_access.c b/modules/aaa/mod_access.c index f1f77b4e36..dcd83e4a73 100644 --- a/modules/aaa/mod_access.c +++ b/modules/aaa/mod_access.c @@ -129,7 +129,7 @@ static void *create_access_dir_config(ap_pool_t *p, char *dummy) return (void *) conf; } -static const char *order(cmd_parms *cmd, void *dv, char *arg) +static const char *order(cmd_parms *cmd, void *dv, const char *arg) { access_dir_conf *d = (access_dir_conf *) dv; int i, o; @@ -157,11 +157,13 @@ static int is_ip(const char *host) return (*host == '\0'); } -static const char *allow_cmd(cmd_parms *cmd, void *dv, char *from, char *where) +static const char *allow_cmd(cmd_parms *cmd, void *dv, const char *from, + const char *where_c) { access_dir_conf *d = (access_dir_conf *) dv; allowdeny *a; char *s; + char *where = ap_pstrdup(cmd->pool, where_c); if (strcasecmp(from, "from")) return "allow and deny must be followed by 'from'"; @@ -273,12 +275,12 @@ static char its_an_allow; static const command_rec access_cmds[] = { - {"order", order, NULL, OR_LIMIT, TAKE1, - "'allow,deny', 'deny,allow', or 'mutual-failure'"}, - {"allow", allow_cmd, &its_an_allow, OR_LIMIT, ITERATE2, - "'from' followed by hostnames or IP-address wildcards"}, - {"deny", allow_cmd, NULL, OR_LIMIT, ITERATE2, - "'from' followed by hostnames or IP-address wildcards"}, + AP_INIT_TAKE1("order", order, NULL, OR_LIMIT, + "'allow,deny', 'deny,allow', or 'mutual-failure'"), + AP_INIT_ITERATE2("allow", allow_cmd, &its_an_allow, OR_LIMIT, + "'from' followed by hostnames or IP-address wildcards"), + AP_INIT_ITERATE2("deny", allow_cmd, NULL, OR_LIMIT, + "'from' followed by hostnames or IP-address wildcards"), {NULL} }; -- 2.40.0