summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg Stein <gstein@apache.org>2000-04-24 10:35:56 +0200
committerGreg Stein <gstein@apache.org>2000-04-24 10:35:56 +0200
commit059ab7a7904a36509e24d6801494329820bd58f4 (patch)
tree40e8e8acd61e635b2c4a20b353bd5abe4a2c2bc2 /include
parentChange strncasecmp() definition to match Bill's prototype. Fixes compile (diff)
downloadapache2-059ab7a7904a36509e24d6801494329820bd58f4.tar.xz
apache2-059ab7a7904a36509e24d6801494329820bd58f4.zip
handle error messages during building and processing of the configuration.
add missing return statements, wrap some lines, remove unused vars. move syntax error reporting and exit(1) back to the right place (to be fixed in a future pass; the exit() is inappropriate for parsing .htaccess files). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85023 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r--include/http_config.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/http_config.h b/include/http_config.h
index e2b7f70f61..a72f60a666 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -305,8 +305,9 @@ API_EXPORT(const char *) ap_find_module_name(module *m);
API_EXPORT(module *) ap_find_linked_module(const char *name);
/* for implementing subconfigs and customized config files */
-API_EXPORT(ap_directive_t *) ap_build_config(cmd_parms *parms, ap_directive_t *current);
-API_EXPORT(const char *)ap_walk_config(ap_directive_t *conftree, cmd_parms *parms, void *config, int container);
+API_EXPORT(const char *) ap_build_config(cmd_parms *parms,
+ ap_directive_t **conftree);
+API_EXPORT(const char *) ap_walk_config(ap_directive_t *conftree, cmd_parms *parms, void *config, int container);
/* ap_check_cmd_context() definitions: */
API_EXPORT(const char *) ap_check_cmd_context(cmd_parms *cmd, unsigned forbidden);