diff options
| author | Zeev Suraski <zeev@php.net> | 1999-04-10 16:25:23 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-04-10 16:25:23 +0000 |
| commit | bb6dff9c671cbddd84b557051932c5ea3c0ea7c7 (patch) | |
| tree | 81edb47ea7eb7ece24f42b1a65a083b2fcf27a42 /main/configuration-parser.y | |
| parent | 4472d0502587f31b77251b2027f3eff858e65add (diff) | |
| download | php-git-bb6dff9c671cbddd84b557051932c5ea3c0ea7c7.tar.gz | |
Buh-bye php3_ini
Diffstat (limited to 'main/configuration-parser.y')
| -rw-r--r-- | main/configuration-parser.y | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/main/configuration-parser.y b/main/configuration-parser.y index ce98b0f24c..22b6e8e400 100644 --- a/main/configuration-parser.y +++ b/main/configuration-parser.y @@ -35,6 +35,7 @@ #define DEBUG_CFG_PARSER 1 #include "php.h" #include "php_globals.h" +#include "php_ini.h" #include "functions/dl.h" #include "functions/file.h" #include "functions/php3_browscap.h" @@ -248,22 +249,22 @@ int php3_init_config(void) int php3_minit_browscap(INIT_FUNC_ARGS) { - TLS_VARS; + char *browscap = INI_STR("browscap"); - if (php3_ini.browscap) { + if (browscap) { if (_php3_hash_init(&GLOBAL(browser_hash), 0, NULL, (void (*)(void *))pvalue_browscap_destructor, 1)==FAILURE) { return FAILURE; } - cfgin = fopen(php3_ini.browscap,"r"); + cfgin = fopen(browscap, "r"); if (!cfgin) { - php3_error(E_WARNING,"Cannot open '%s' for reading",php3_ini.browscap); + php3_error(E_WARNING,"Cannot open '%s' for reading", browscap); return FAILURE; } init_cfg_scanner(); active__php3_hash_table = &GLOBAL(browser_hash); parsing_mode = PARSING_MODE_BROWSCAP; - currently_parsed_filename = php3_ini.browscap; + currently_parsed_filename = browscap; yyparse(); fclose(cfgin); } @@ -281,9 +282,7 @@ int php3_shutdown_config(void) int php3_mshutdown_browscap(SHUTDOWN_FUNC_ARGS) { - TLS_VARS; - - if (php3_ini.browscap) { + if (INI_STR("browscap")) { _php3_hash_destroy(&GLOBAL(browser_hash)); } return SUCCESS; |