diff options
| author | Zeev Suraski <zeev@php.net> | 1999-04-24 00:12:00 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-04-24 00:12:00 +0000 |
| commit | 0818d96c97ceec4dbb8251c5220a2fdcdf39f355 (patch) | |
| tree | c56f529e445e4bee928e7c28e0ccbb7f67572f16 /main/configuration-parser.y | |
| parent | 05d24c60223439b94d4100538331fb6749022ca3 (diff) | |
| download | php-git-0818d96c97ceec4dbb8251c5220a2fdcdf39f355.tar.gz | |
A lot of cleanups... Removed old thread-safe code and other redundant code and files
Diffstat (limited to 'main/configuration-parser.y')
| -rw-r--r-- | main/configuration-parser.y | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/configuration-parser.y b/main/configuration-parser.y index eded973084..19bbb0d62d 100644 --- a/main/configuration-parser.y +++ b/main/configuration-parser.y @@ -177,8 +177,8 @@ int php3_init_config(void) } #if WIN32|WINNT { - if (GLOBAL(php3_ini_path)) { - default_location = GLOBAL(php3_ini_path); + if (php3_ini_path) { + default_location = php3_ini_path; } else { default_location = (char *) malloc(512); @@ -189,17 +189,17 @@ int php3_init_config(void) } } #else - if (!GLOBAL(php3_ini_path)) { + if (!php3_ini_path) { default_location = CONFIGURATION_FILE_PATH; } else { - default_location = GLOBAL(php3_ini_path); + default_location = php3_ini_path; } #endif /* build a path */ php_ini_path = (char *) malloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1); - if (!GLOBAL(php3_ini_path)) { + if (!php3_ini_path) { #if WIN32|WINNT sprintf(php_ini_path,".;%s;%s",env_location,default_location); #else @@ -258,7 +258,7 @@ int php3_minit_browscap(INIT_FUNC_ARGS) char *browscap = INI_STR("browscap"); if (browscap) { - if (_php3_hash_init(&GLOBAL(browser_hash), 0, NULL, (void (*)(void *))pvalue_browscap_destructor, 1)==FAILURE) { + if (_php3_hash_init(&browser_hash, 0, NULL, (void (*)(void *))pvalue_browscap_destructor, 1)==FAILURE) { return FAILURE; } @@ -268,7 +268,7 @@ int php3_minit_browscap(INIT_FUNC_ARGS) return FAILURE; } init_cfg_scanner(); - active__php3_hash_table = &GLOBAL(browser_hash); + active__php3_hash_table = &browser_hash; parsing_mode = PARSING_MODE_BROWSCAP; currently_parsed_filename = browscap; yyparse(); @@ -289,7 +289,7 @@ int php3_shutdown_config(void) int php3_mshutdown_browscap(SHUTDOWN_FUNC_ARGS) { if (INI_STR("browscap")) { - _php3_hash_destroy(&GLOBAL(browser_hash)); + _php3_hash_destroy(&browser_hash); } return SUCCESS; } |