From 942809909e1bc125db038796c0a1a0b53eeaca7d Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 2 Feb 2015 13:23:16 +0800 Subject: Cleanup resource handling APIs --- main/php_streams.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'main/php_streams.h') diff --git a/main/php_streams.h b/main/php_streams.h index 6240fdd653..9a22a531f4 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -253,8 +253,13 @@ END_EXTERN_C() * when the resources are auto-destructed */ #define php_stream_to_zval(stream, zval) { ZVAL_RES(zval, (stream)->res); (stream)->__exposed++; } -#define php_stream_from_zval(xstr, pzval) ZEND_FETCH_RESOURCE2((xstr), php_stream *, (pzval), -1, "stream", php_file_le_stream(), php_file_le_pstream()) -#define php_stream_from_zval_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource((pzval), -1, "stream", NULL, 2, php_file_le_stream(), php_file_le_pstream()) +#define php_stream_from_zval(xstr, pzval) do { \ + if (((xstr) = (php_stream*)zend_fetch_resource2_ex((pzval), \ + "stream", NULL, php_file_le_stream(), php_file_le_pstream())) == NULL) { \ + RETURN_FALSE; \ + } \ +} while (0) +#define php_stream_from_zval_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource2_ex((pzval), "stream", NULL, php_file_le_stream(), php_file_le_pstream()) BEGIN_EXTERN_C() PHPAPI php_stream *php_stream_encloses(php_stream *enclosing, php_stream *enclosed); -- cgit v1.2.1 From 38efb690c0772d6d3bab20a1b1fee383eca1c04d Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 2 Feb 2015 13:52:56 +0800 Subject: Ported ftp --- main/php_streams.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'main/php_streams.h') diff --git a/main/php_streams.h b/main/php_streams.h index 9a22a531f4..913c4c3bb4 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -259,6 +259,12 @@ END_EXTERN_C() RETURN_FALSE; \ } \ } while (0) +#define php_stream_from_res(xstr, res) do { \ + if (((xstr) = (php_stream*)zend_fetch_resource2((res), \ + "stream", NULL, php_file_le_stream(), php_file_le_pstream())) == NULL) { \ + RETURN_FALSE; \ + } \ +} while (0) #define php_stream_from_zval_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource2_ex((pzval), "stream", NULL, php_file_le_stream(), php_file_le_pstream()) BEGIN_EXTERN_C() -- cgit v1.2.1 From 7ec8eb380dd87caa877490d3cd0b1dce41e5187e Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 2 Feb 2015 13:56:20 +0800 Subject: Use resource directly --- main/php_streams.h | 1 + 1 file changed, 1 insertion(+) (limited to 'main/php_streams.h') diff --git a/main/php_streams.h b/main/php_streams.h index 913c4c3bb4..177624df48 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -265,6 +265,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", NULL, 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", NULL, php_file_le_stream(), php_file_le_pstream()) BEGIN_EXTERN_C() -- cgit v1.2.1 From e98caf27eaed852ee3567b1994167c85b89f79e5 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 2 Feb 2015 14:45:19 +0800 Subject: found type is unnecessary --- main/php_streams.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main/php_streams.h') diff --git a/main/php_streams.h b/main/php_streams.h index 177624df48..3cd0c047cd 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -255,18 +255,18 @@ END_EXTERN_C() #define php_stream_from_zval(xstr, pzval) do { \ if (((xstr) = (php_stream*)zend_fetch_resource2_ex((pzval), \ - "stream", NULL, php_file_le_stream(), php_file_le_pstream())) == NULL) { \ + "stream", php_file_le_stream(), php_file_le_pstream())) == NULL) { \ RETURN_FALSE; \ } \ } while (0) #define php_stream_from_res(xstr, res) do { \ if (((xstr) = (php_stream*)zend_fetch_resource2((res), \ - "stream", NULL, php_file_le_stream(), php_file_le_pstream())) == NULL) { \ + "stream", php_file_le_stream(), php_file_le_pstream())) == NULL) { \ RETURN_FALSE; \ } \ } while (0) -#define php_stream_from_res_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource((res), "stream", NULL, 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", NULL, php_file_le_stream(), php_file_le_pstream()) +#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_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() PHPAPI php_stream *php_stream_encloses(php_stream *enclosing, php_stream *enclosed); -- cgit v1.2.1