cvs: php4 /main fopen_wrappers.c main.c php_ini.c

sterling Mon Nov 26 13:57:45 2001 EDT Modified files: /php4/main fopen_wrappers.c main.c php_ini.c Log: Z_TYPE(filehandle)?? ok.. whatever... ;) Index: php4/main/fopen_wrappers.c diff -u php4/main/fopen_wrappers.c:1.137 php4/main/fopen_wrappers.c:1.138 --- php4/main/fopen_wrappers.c:1.137 Tue Sep 25 17:58:33 2001 +++ php4/main/fopen_wrappers.c Mon Nov 26 13:57:44 2001 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.c,v 1.137 2001/09/25 21:58:33 jeroen Exp $ */ +/* $Id: fopen_wrappers.c,v 1.138 2001/11/26 18:57:44 sterling Exp $ */ /* {{{ includes */ @@ -360,7 +360,7 @@ file_handle->filename = SG(request_info).path_translated; file_handle->free_filename = 0; file_handle->handle.fp = fp; - Z_TYPE_P(file_handle) = ZEND_HANDLE_FP; + file_handle->type = ZEND_HANDLE_FP; return SUCCESS; } Index: php4/main/main.c diff -u php4/main/main.c:1.411 php4/main/main.c:1.412 --- php4/main/main.c:1.411 Mon Nov 19 09:59:38 2001 +++ php4/main/main.c Mon Nov 26 13:57:44 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.411 2001/11/19 14:59:38 zeev Exp $ */ +/* $Id: main.c,v 1.412 2001/11/26 18:57:44 sterling Exp $ */ /* {{{ includes */ @@ -1282,7 +1282,7 @@ PG(during_request_startup) = 0; - if (Z_TYPE_P(primary_file) == ZEND_HANDLE_FILENAME + if (primary_file->type == ZEND_HANDLE_FILENAME && primary_file->filename) { VCWD_GETCWD(old_cwd, OLD_CWD_SIZE-1); VCWD_CHDIR_FILE(primary_file->filename); @@ -1292,7 +1292,7 @@ prepend_file.filename = PG(auto_prepend_file); prepend_file.opened_path = NULL; prepend_file.free_filename = 0; - Z_TYPE(prepend_file) = ZEND_HANDLE_FILENAME; + prepend_file.type = ZEND_HANDLE_FILENAME; prepend_file_p = &prepend_file; } else { prepend_file_p = NULL; @@ -1301,7 +1301,7 @@ append_file.filename = PG(auto_append_file); append_file.opened_path = NULL; append_file.free_filename = 0; - Z_TYPE(append_file) = ZEND_HANDLE_FILENAME; + append_file.type = ZEND_HANDLE_FILENAME; append_file_p = &append_file; } else { append_file_p = NULL; Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.75 php4/main/php_ini.c:1.76 --- php4/main/php_ini.c:1.75 Thu Nov 1 05:57:49 2001 +++ php4/main/php_ini.c Mon Nov 26 13:57:44 2001 @@ -262,7 +262,7 @@ if (!fh.handle.fp) { return SUCCESS; /* having no configuration file is ok */ } - Z_TYPE(fh) = ZEND_HANDLE_FP; + fh.type = ZEND_HANDLE_FP; fh.filename = php_ini_opened_path; zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);