cvs: php4 /ext/standard basic_functions.c file.c /ext/zlib zlib.c /main main.c php_streams.h streams.c

zeev Mon Mar 18 03:05:29 2002 EDT Modified files: /php4/ext/standard basic_functions.c file.c /php4/ext/zlib zlib.c /php4/main main.c php_streams.h streams.c Log: Fix the build and all of the outstanding VC++ warnings

Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.454 php4/ext/standard/basic_functions.c:1.455 --- php4/ext/standard/basic_functions.c:1.454 Sun Mar 17 17:50:56 2002 +++ php4/ext/standard/basic_functions.c Mon Mar 18 03:05:27 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.454 2002/03/17 22:50:56 wez Exp $ */ +/* $Id: basic_functions.c,v 1.455 2002/03/18 08:05:27 zeev Exp $ */ #include "php.h" #include "php_streams.h" @@ -1005,14 +1005,14 @@ if (PG(allow_url_fopen)) { - if (FAILURE == php_register_url_stream_wrapper("http", &php_stream_http_wrapper)) + if (FAILURE == php_register_url_stream_wrapper("http", &php_stream_http_wrapper TSRMLS_CC)) return FAILURE; - if (FAILURE == php_register_url_stream_wrapper("php", &php_stream_php_wrapper)) + if (FAILURE == php_register_url_stream_wrapper("php", &php_stream_php_wrapper TSRMLS_CC)) return FAILURE; - if (FAILURE == php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper)) + if (FAILURE == php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper TSRMLS_CC)) return FAILURE; # if HAVE_OPENSSL_EXT - if (FAILURE == php_register_url_stream_wrapper("https", &php_stream_http_wrapper)) + if (FAILURE == php_register_url_stream_wrapper("https", &php_stream_http_wrapper TSRMLS_CC)) return FAILURE; # endif } @@ -1030,11 +1030,11 @@ #endif if (PG(allow_url_fopen)) { - php_unregister_url_stream_wrapper("http"); - php_unregister_url_stream_wrapper("ftp"); - php_unregister_url_stream_wrapper("php"); + php_unregister_url_stream_wrapper("http" TSRMLS_CC); + php_unregister_url_stream_wrapper("ftp" TSRMLS_CC); + php_unregister_url_stream_wrapper("php" TSRMLS_CC); # if HAVE_OPENSSL_EXT - php_unregister_url_stream_wrapper("https"); + php_unregister_url_stream_wrapper("https" TSRMLS_CC); # endif } Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.212 php4/ext/standard/file.c:1.213 --- php4/ext/standard/file.c:1.212 Sat Mar 16 11:52:24 2002 +++ php4/ext/standard/file.c Mon Mar 18 03:05:27 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.212 2002/03/16 16:52:24 wez Exp $ */ +/* $Id: file.c,v 1.213 2002/03/18 08:05:27 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -238,10 +238,14 @@ return; } + php_stream_open_wrapper(filename, "rb", 0, NULL); + md.stream = php_stream_open_wrapper(filename, "rb", use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, - NULL TSRMLS_CC); + NULL); + + if (!md.stream) { RETURN_FALSE; } @@ -385,7 +389,7 @@ stream = php_stream_open_wrapper(filename, "rb", use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, - NULL TSRMLS_CC); + NULL); if (!stream) { RETURN_FALSE; } @@ -432,7 +436,7 @@ stream = php_stream_open_wrapper(filename, "rb", use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, - NULL TSRMLS_CC); + NULL); if (!stream) { RETURN_FALSE; } @@ -583,7 +587,7 @@ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), Z_STRVAL_PP(arg2), use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, - NULL TSRMLS_CC); + NULL); if (stream == NULL) { RETURN_FALSE; } @@ -1400,7 +1404,7 @@ stream = php_stream_open_wrapper(Z_STRVAL_PP(arg1), "rb", use_include_path | ENFORCE_SAFE_MODE | REPORT_ERRORS, - NULL TSRMLS_CC); + NULL); if (stream) { size = php_passthru_stream(stream TSRMLS_CC); php_stream_close(stream); @@ -1694,11 +1698,11 @@ srcstream = php_stream_open_wrapper(src, "rb", ENFORCE_SAFE_MODE | REPORT_ERRORS, - NULL TSRMLS_CC); + NULL); deststream = php_stream_open_wrapper(dest, "wb", ENFORCE_SAFE_MODE | REPORT_ERRORS, - NULL TSRMLS_CC); + NULL); if (srcstream && deststream) ret = php_stream_copy_to_stream(srcstream, deststream, PHP_STREAM_COPY_ALL) == 0 ? FAILURE : SUCCESS; Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.112 php4/ext/zlib/zlib.c:1.113 --- php4/ext/zlib/zlib.c:1.112 Sun Mar 17 17:50:58 2002 +++ php4/ext/zlib/zlib.c Mon Mar 18 03:05:28 2002 @@ -18,7 +18,7 @@ | Jade Nicoletti <nicoletti@nns.ch> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.112 2002/03/17 22:50:58 wez Exp $ */ +/* $Id: zlib.c,v 1.113 2002/03/18 08:05:28 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -188,7 +188,7 @@ le_zp = zend_register_list_destructors_ex(phpi_destructor_gzclose, NULL, "zlib", module_number); if(PG(allow_url_fopen)) { - php_register_url_stream_wrapper("zlib", &php_stream_gzip_wrapper); + php_register_url_stream_wrapper("zlib", &php_stream_gzip_wrapper TSRMLS_CC); } REGISTER_LONG_CONSTANT("FORCE_GZIP", CODING_GZIP, CONST_CS | CONST_PERSISTENT); Index: php4/main/main.c diff -u php4/main/main.c:1.436 php4/main/main.c:1.437 --- php4/main/main.c:1.436 Sun Mar 17 17:50:58 2002 +++ php4/main/main.c Mon Mar 18 03:05:28 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.436 2002/03/17 22:50:58 wez Exp $ */ +/* $Id: main.c,v 1.437 2002/03/18 08:05:28 zeev Exp $ */ /* {{{ includes */ @@ -565,6 +565,7 @@ { FILE *retval = NULL; php_stream *stream; + TSRMLS_FETCH(); stream = php_stream_open_wrapper((char *)filename, "rb", USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS, opened_path); if (stream) { @@ -951,7 +952,7 @@ /* initialize stream wrappers registry * (this uses configuration parameters from php.ini) */ - if (php_init_stream_wrappers() == FAILURE) { + if (php_init_stream_wrappers(TSRMLS_C) == FAILURE) { php_printf("PHP: Unable to initialize stream url wrappers.\n"); return FAILURE; } @@ -1056,7 +1057,7 @@ zend_shutdown(TSRMLS_C); - php_shutdown_stream_wrappers(); + php_shutdown_stream_wrappers(TSRMLS_C); php_shutdown_info_logos(); UNREGISTER_INI_ENTRIES(); Index: php4/main/php_streams.h diff -u php4/main/php_streams.h:1.15 php4/main/php_streams.h:1.16 --- php4/main/php_streams.h:1.15 Sun Mar 17 17:50:59 2002 +++ php4/main/php_streams.h Mon Mar 18 03:05:28 2002 @@ -227,10 +227,10 @@ # define IGNORE_URL_WIN 0 #endif -int php_init_stream_wrappers(void); -int php_shutdown_stream_wrappers(void); -PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper *wrapper); -PHPAPI int php_unregister_url_stream_wrapper(char *protocol); +int php_init_stream_wrappers(TSRMLS_D); +int php_shutdown_stream_wrappers(TSRMLS_D); +PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper *wrapper TSRMLS_DC); +PHPAPI int php_unregister_url_stream_wrapper(char *protocol TSRMLS_DC); PHPAPI php_stream *_php_stream_open_wrapper(char *path, char *mode, int options, char **opened_path STREAMS_DC); #define php_stream_open_wrapper(path, mode, options, opened) _php_stream_open_wrapper((path), (mode), (options), (opened) STREAMS_CC) Index: php4/main/streams.c diff -u php4/main/streams.c:1.27 php4/main/streams.c:1.28 --- php4/main/streams.c:1.27 Sun Mar 17 17:50:59 2002 +++ php4/main/streams.c Mon Mar 18 03:05:28 2002 @@ -881,30 +881,35 @@ } /* }}} */ -int php_init_stream_wrappers(void) +int php_init_stream_wrappers(TSRMLS_D) { - if (PG(allow_url_fopen)) + if (PG(allow_url_fopen)) { return zend_hash_init(&url_stream_wrappers_hash, 0, NULL, NULL, 1); + } return SUCCESS; } -int php_shutdown_stream_wrappers(void) +int php_shutdown_stream_wrappers(TSRMLS_D) { - if (PG(allow_url_fopen)) + if (PG(allow_url_fopen)) { zend_hash_destroy(&url_stream_wrappers_hash); + } return SUCCESS; } -PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper *wrapper) +PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper *wrapper TSRMLS_DC) { - if (PG(allow_url_fopen)) + if (PG(allow_url_fopen)) { return zend_hash_add(&url_stream_wrappers_hash, protocol, strlen(protocol), wrapper, sizeof(*wrapper), NULL); + } return FAILURE; } -PHPAPI int php_unregister_url_stream_wrapper(char *protocol) + +PHPAPI int php_unregister_url_stream_wrapper(char *protocol TSRMLS_DC) { - if (PG(allow_url_fopen)) + if (PG(allow_url_fopen)) { return zend_hash_del(&url_stream_wrappers_hash, protocol, strlen(protocol)); + } return SUCCESS; } @@ -953,7 +958,6 @@ PHPAPI php_stream *_php_stream_open_wrapper(char *path, char *mode, int options, char **opened_path STREAMS_DC) { php_stream *stream = NULL; - TSRMLS_FETCH(); if (opened_path) *opened_path = NULL;