com php-src: Fix typo in php_stream_from_res_no_verif y: main/php_streams.h

From: Date: Sun, 29 Nov 2015 19:28:25 +0000
Subject: com php-src: Fix typo in php_stream_from_res_no_verif y: main/php_streams.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90056@lists.php.net to get a copy of this message
Commit: e6e77d9e275ce422edebf15bafd7e33cd7c73627 Author: Jakub Zelenka <bukka@php.net> Sun, 29 Nov 2015 19:28:25 +0000 Parents: 4424cbf7573ca28e883bdf3994021c9d098ae97f Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e6e77d9e275ce422edebf15bafd7e33cd7c73627 Log: Fix typo in php_stream_from_res_no_verify This macro is not used but it's wrong as zend_fetch_resource accepts only 3 args and just one res index. So obviously we need to use zend_fetch_resource2 here. Changed paths: M main/php_streams.h Diff: diff --git a/main/php_streams.h b/main/php_streams.h index 255b065..097e727 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -267,7 +267,7 @@ END_EXTERN_C() RETURN_FALSE; \ } \ } while (0) -#define php_stream_from_res_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource((res), "stream", php_file_le_stream(), php_file_le_pstream()) +#define php_stream_from_res_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource2((res), "stream", php_file_le_stream(), php_file_le_pstream()) #define php_stream_from_zval_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource2_ex((pzval), "stream", php_file_le_stream(), php_file_le_pstream()) BEGIN_EXTERN_C()

« previous php.cvs (#90056) next »