archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

streams: refactor statbuf_from_array()

Browse source
This commit is contained in:
Gina Peter Banyard 2025-07-12 15:26:49 +01:00
parent 9e334af6e4
commit 4d5bdef21a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/streams/userspace.c
View file

@ -794,12 +794,12 @@ static int php_userstreamop_seek(php_stream *stream, zend_off_t offset, int when
/* parse the return value from one of the stat functions and store the /* parse the return value from one of the stat functions and store the
* relevant fields into the statbuf provided */ * relevant fields into the statbuf provided */
static void statbuf_from_array(zval *array, php_stream_statbuf *ssb) static void statbuf_from_array(const HashTable *array, php_stream_statbuf *ssb)
{ {
zval *elem; zval *elem;
#define STAT_PROP_ENTRY_EX(name, name2) \ #define STAT_PROP_ENTRY_EX(name, name2) \
if (NULL != (elem = zend_hash_str_find(Z_ARRVAL_P(array), #name, sizeof(#name)-1))) { \ if (NULL != (elem = zend_hash_str_find(array, #name, sizeof(#name)-1))) { \
ssb->sb.st_##name2 = zval_get_long(elem); \ ssb->sb.st_##name2 = zval_get_long(elem); \
} }
@ -842,7 +842,7 @@ static int php_userstreamop_stat(php_stream *stream, php_stream_statbuf *ssb)
zend_result call_result = call_method_if_exists(&us->object, &func_name, &retval, 0, NULL); zend_result call_result = call_method_if_exists(&us->object, &func_name, &retval, 0, NULL);
if (call_result == SUCCESS && Z_TYPE(retval) == IS_ARRAY) { if (call_result == SUCCESS && Z_TYPE(retval) == IS_ARRAY) {
statbuf_from_array(&retval, ssb); statbuf_from_array(Z_ARR(retval), ssb);
ret = 0; ret = 0;
} else { } else {
if (call_result == FAILURE) { if (call_result == FAILURE) {
@ -1275,7 +1275,7 @@ static int user_wrapper_stat_url(php_stream_wrapper *wrapper, const char *url, i
if (call_result == SUCCESS && Z_TYPE(zretval) == IS_ARRAY) { if (call_result == SUCCESS && Z_TYPE(zretval) == IS_ARRAY) {
/* We got the info we needed */ /* We got the info we needed */
statbuf_from_array(&zretval, ssb); statbuf_from_array(Z_ARR(zretval), ssb);
ret = 0; ret = 0;
} else { } else {
if (call_result == FAILURE) { if (call_result == FAILURE) {