Author: wrowe Date: Mon Aug 29 09:19:58 2005 New Revision: 264163 URL: http://svn.apache.org/viewcvs?rev=264163&view=rev Log:
Jeff White observed that it's hard to follow "which conf am I looking at?" in the debugger. Begin renaming a few structures and function names, at least the static/locals, starting with s/sconf/srvconf/. Modified: httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Modified: httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp URL: http://svn.apache.org/viewcvs/httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp?rev=264163&r1=264162&r2=264163&view=diff ============================================================================== --- httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp (original) +++ httpd/mod_aspdotnet/trunk/mod/mod_aspdotnet.cpp Mon Aug 29 09:19:58 2005 @@ -93,23 +93,23 @@ asp_net_host_conf_t *host; } asp_net_alias_t; -typedef struct asp_net_sconf_t { +typedef struct asp_net_srvconf_t { apr_hash_t *aliases; // Hash of asp_net_alias_t records -} asp_net_sconf_t; +} asp_net_srvconf_t; -static void *create_asp_net_sconf(apr_pool_t *p, server_rec *s) +static void *create_asp_net_srvconf(apr_pool_t *p, server_rec *s) { - asp_net_sconf_t *sconf; - sconf = (asp_net_sconf_t*)apr_palloc(p, sizeof(asp_net_sconf_t)); - sconf->aliases = apr_hash_make(p); - return sconf; + asp_net_srvconf_t *srvconf; + srvconf = (asp_net_srvconf_t*)apr_palloc(p, sizeof(asp_net_srvconf_t)); + srvconf->aliases = apr_hash_make(p); + return srvconf; } -static void *merge_asp_net_sconfs(apr_pool_t *p, void *basev, void *addv) +static void *merge_asp_net_srvconf(apr_pool_t *p, void *basev, void *addv) { - asp_net_sconf_t *base = (asp_net_sconf_t*)basev; - asp_net_sconf_t *add = (asp_net_sconf_t*)addv; + asp_net_srvconf_t *base = (asp_net_srvconf_t*)basev; + asp_net_srvconf_t *add = (asp_net_srvconf_t*)addv; apr_hash_overlay(p, add->aliases, base->aliases); return add; } @@ -119,8 +119,8 @@ const char *uri, const char *rootarg) { char *root; - asp_net_sconf_t *sconf - = (asp_net_sconf_t*)ap_get_module_config(cmd->server->module_config, + asp_net_srvconf_t *srvconf + = (asp_net_srvconf_t*)ap_get_module_config(cmd->server->module_config, &aspdotnet_module); asp_net_alias_t *mount = (asp_net_alias_t*)apr_palloc(cmd->pool, sizeof(*mount)); @@ -173,7 +173,7 @@ mount->host->combined_len, mount->host); } - apr_hash_set(sconf->aliases, mount->virtual_path, + apr_hash_set(srvconf->aliases, mount->virtual_path, mount->virtual_path_len, mount); return NULL; } @@ -465,13 +465,13 @@ return HTTP_NOT_FOUND; } - asp_net_sconf_t *sconf - = (asp_net_sconf_t*)ap_get_module_config(r->server->module_config, - &aspdotnet_module); + asp_net_srvconf_t *srvconf + = (asp_net_srvconf_t*)ap_get_module_config(r->server->module_config, + &aspdotnet_module); asp_net_host_conf_t *host = NULL; apr_hash_index_t *item; - for (item = apr_hash_first(r->pool, sconf->aliases); item; + for (item = apr_hash_first(r->pool, srvconf->aliases); item; item = apr_hash_next(item)) { asp_net_alias_t *alias; @@ -707,8 +707,8 @@ STANDARD20_MODULE_STUFF, NULL, /* dir config */ NULL, /* merge dir config */ - create_asp_net_sconf, /* server config */ - merge_asp_net_sconfs, /* merge server config */ + create_asp_net_srvconf, /* server config */ + merge_asp_net_srvconf, /* merge server config */ asp_net_cmds, /* command apr_table_t */ register_hooks /* register hooks */ };