cvs: php-src /ext/zlib zlib.c

From: Date: Sat, 08 Jul 2006 21:54:49 +0000
Subject: cvs: php-src /ext/zlib zlib.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-39073@lists.php.net to get a copy of this message
nlopess Sat Jul 8 21:54:49 2006 UTC Modified files: /php-src/ext/zlib zlib.c Log: change char* to void* when using the 't' parameter (as noted by Andrei) http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.201&r2=1.202&diff_format=u Index: php-src/ext/zlib/zlib.c diff -u php-src/ext/zlib/zlib.c:1.201 php-src/ext/zlib/zlib.c:1.202 --- php-src/ext/zlib/zlib.c:1.201 Fri Jul 7 23:30:30 2006 +++ php-src/ext/zlib/zlib.c Sat Jul 8 21:54:49 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.201 2006/07/07 23:30:30 nlopess Exp $ */ +/* $Id: zlib.c,v 1.202 2006/07/08 21:54:49 nlopess Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -275,7 +275,7 @@ Read and uncompress entire .gz-file into an array */ PHP_FUNCTION(gzfile) { - char *filename; + void *filename; int filename_len; zend_uchar filename_type; long flags = 0; @@ -291,7 +291,7 @@ use_include_path = flags ? USE_PATH : 0; if (filename_type == IS_UNICODE) { - if (php_stream_path_encode(NULL, &filename, &filename_len, (UChar*)filename, filename_len, REPORT_ERRORS, NULL) == FAILURE) { + if (php_stream_path_encode(NULL, (char**)&filename, &filename_len, (UChar*)filename, filename_len, REPORT_ERRORS, NULL) == FAILURE) { RETURN_FALSE; } } @@ -323,7 +323,8 @@ Open a .gz-file and return a .gz-file pointer */ PHP_FUNCTION(gzopen) { - char *filename, *mode; + void *filename; + char *mode; int filename_len, mode_len; zend_uchar filename_type; long flags = 0; @@ -337,7 +338,7 @@ use_include_path = flags ? USE_PATH : 0; if (filename_type == IS_UNICODE) { - if (php_stream_path_encode(NULL, &filename, &filename_len, (UChar*)filename, filename_len, REPORT_ERRORS, NULL) == FAILURE) { + if (php_stream_path_encode(NULL, (char**)&filename, &filename_len, (UChar*)filename, filename_len, REPORT_ERRORS, NULL) == FAILURE) { RETURN_FALSE; } }

« previous php.cvs (#39073) next »