streams: use type zend_result instead of type int

Girgias · Girgias · commit 841afdc4866b · 2025-08-04T15:30:57.000+01:00
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -6388,7 +6388,7 @@ PHP_FUNCTION(pg_socket_poll)
 		Z_PARAM_LONG(ts)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void **)&socket, 0)) {
+	if (UNEXPECTED(php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void **)&socket, 0) == FAILURE)) {
 		zend_argument_type_error(1, "invalid resource socket");
 		RETURN_THROWS();
 	}
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
@@ -2585,7 +2585,7 @@ PHP_FUNCTION(socket_import_stream)
 	ZEND_PARSE_PARAMETERS_END();
 	php_stream_from_zval(stream, zstream);
 
-	if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void**)&socket, 1)) {
+	if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void**)&socket, 1) == FAILURE) {
 		/* error supposedly already shown */
 		RETURN_FALSE;
 	}
diff --git a/main/php_streams.h b/main/php_streams.h
@@ -561,7 +561,7 @@ END_EXTERN_C()
 #define PHP_STREAM_CAST_INTERNAL	0x20000000	/* stream cast for internal use */
 #define PHP_STREAM_CAST_MASK		(PHP_STREAM_CAST_TRY_HARD | PHP_STREAM_CAST_RELEASE | PHP_STREAM_CAST_INTERNAL)
 BEGIN_EXTERN_C()
-PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show_err);
+PHPAPI zend_result _php_stream_cast(php_stream *stream, int castas, void **ret, int show_err);
 END_EXTERN_C()
 /* use this to check if a stream can be cast into another form */
 #define php_stream_can_cast(stream, as)	_php_stream_cast((stream), (as), NULL, 0)
@@ -626,7 +626,7 @@ END_EXTERN_C()
 /* this flag is only used by include/require functions */
 #define STREAM_OPEN_FOR_ZEND_STREAM     0x00010000
 
-int php_init_stream_wrappers(int module_number);
+zend_result php_init_stream_wrappers(int module_number);
 void php_shutdown_stream_wrappers(int module_number);
 void php_shutdown_stream_hashes(void);
 PHP_RSHUTDOWN_FUNCTION(streams);
diff --git a/main/streams/cast.c b/main/streams/cast.c
@@ -191,7 +191,7 @@ void php_stream_mode_sanitize_fdopen_fopencookie(php_stream *stream, char *resul
 /* }}} */
 
 /* {{{ php_stream_cast */
-PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show_err)
+PHPAPI zend_result _php_stream_cast(php_stream *stream, int castas, void **ret, int show_err)
 {
 	int flags = castas & PHP_STREAM_CAST_MASK;
 	castas &= ~PHP_STREAM_CAST_MASK;
@@ -273,12 +273,12 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
 
 			newstream = php_stream_fopen_tmpfile();
 			if (newstream) {
-				int retcopy = php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL, NULL);
+				zend_result retcopy = php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL, NULL);
 
 				if (retcopy != SUCCESS) {
 					php_stream_close(newstream);
 				} else {
-					int retcast = php_stream_cast(newstream, castas | flags, (void **)ret, show_err);
+					zend_result retcast = php_stream_cast(newstream, castas | flags, (void **)ret, show_err);
 
 					if (retcast == SUCCESS) {
 						rewind(*(FILE**)ret);
diff --git a/main/streams/filter.c b/main/streams/filter.c
@@ -40,22 +40,22 @@ PHPAPI HashTable *_php_get_stream_filters_hash(void)
 }
 
 /* API for registering GLOBAL filters */
-PHPAPI int php_stream_filter_register_factory(const char *filterpattern, const php_stream_filter_factory *factory)
+PHPAPI zend_result php_stream_filter_register_factory(const char *filterpattern, const php_stream_filter_factory *factory)
 {
-	int ret;
+	zend_result ret;
 	zend_string *str = zend_string_init_interned(filterpattern, strlen(filterpattern), true);
 	ret = zend_hash_add_ptr(&stream_filters_hash, str, (void*)factory) ? SUCCESS : FAILURE;
 	zend_string_release_ex(str, true);
 	return ret;
 }
 
-PHPAPI int php_stream_filter_unregister_factory(const char *filterpattern)
+PHPAPI zend_result php_stream_filter_unregister_factory(const char *filterpattern)
 {
 	return zend_hash_str_del(&stream_filters_hash, filterpattern, strlen(filterpattern));
 }
 
 /* API for registering VOLATILE wrappers */
-PHPAPI int php_stream_filter_register_factory_volatile(zend_string *filterpattern, const php_stream_filter_factory *factory)
+PHPAPI zend_result php_stream_filter_register_factory_volatile(zend_string *filterpattern, const php_stream_filter_factory *factory)
 {
 	if (!FG(stream_filters)) {
 		ALLOC_HASHTABLE(FG(stream_filters));
@@ -282,7 +282,7 @@ PHPAPI void php_stream_filter_free(php_stream_filter *filter)
 	pefree(filter, filter->is_persistent);
 }
 
-PHPAPI int php_stream_filter_prepend_ex(php_stream_filter_chain *chain, php_stream_filter *filter)
+PHPAPI zend_result php_stream_filter_prepend_ex(php_stream_filter_chain *chain, php_stream_filter *filter)
 {
 	filter->next = chain->head;
 	filter->prev = NULL;
@@ -303,7 +303,7 @@ PHPAPI void _php_stream_filter_prepend(php_stream_filter_chain *chain, php_strea
 	php_stream_filter_prepend_ex(chain, filter);
 }
 
-PHPAPI int php_stream_filter_append_ex(php_stream_filter_chain *chain, php_stream_filter *filter)
+PHPAPI zend_result php_stream_filter_append_ex(php_stream_filter_chain *chain, php_stream_filter *filter)
 {
 	php_stream *stream = chain->stream;
 
@@ -395,7 +395,7 @@ PHPAPI void _php_stream_filter_append(php_stream_filter_chain *chain, php_stream
 	}
 }
 
-PHPAPI int _php_stream_filter_flush(php_stream_filter *filter, bool finish)
+PHPAPI zend_result _php_stream_filter_flush(php_stream_filter *filter, bool finish)
 {
 	php_stream_bucket_brigade brig_a = { NULL, NULL }, brig_b = { NULL, NULL }, *inp = &brig_a, *outp = &brig_b, *brig_temp;
 	php_stream_bucket *bucket;
diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h
@@ -121,10 +121,10 @@ struct _php_stream_filter {
 /* stack filter onto a stream */
 BEGIN_EXTERN_C()
 PHPAPI void _php_stream_filter_prepend(php_stream_filter_chain *chain, php_stream_filter *filter);
-PHPAPI int php_stream_filter_prepend_ex(php_stream_filter_chain *chain, php_stream_filter *filter);
+PHPAPI zend_result php_stream_filter_prepend_ex(php_stream_filter_chain *chain, php_stream_filter *filter);
 PHPAPI void _php_stream_filter_append(php_stream_filter_chain *chain, php_stream_filter *filter);
-PHPAPI int php_stream_filter_append_ex(php_stream_filter_chain *chain, php_stream_filter *filter);
-PHPAPI int _php_stream_filter_flush(php_stream_filter *filter, bool finish);
+PHPAPI zend_result php_stream_filter_append_ex(php_stream_filter_chain *chain, php_stream_filter *filter);
+PHPAPI zend_result _php_stream_filter_flush(php_stream_filter *filter, bool finish);
 PHPAPI php_stream_filter *php_stream_filter_remove(php_stream_filter *filter, bool call_dtor);
 PHPAPI void php_stream_filter_free(php_stream_filter *filter);
 PHPAPI php_stream_filter *_php_stream_filter_alloc(const php_stream_filter_ops *fops, void *abstract, uint8_t persistent STREAMS_DC);
@@ -142,8 +142,8 @@ typedef struct _php_stream_filter_factory {
 } php_stream_filter_factory;
 
 BEGIN_EXTERN_C()
-PHPAPI int php_stream_filter_register_factory(const char *filterpattern, const php_stream_filter_factory *factory);
-PHPAPI int php_stream_filter_unregister_factory(const char *filterpattern);
-PHPAPI int php_stream_filter_register_factory_volatile(zend_string *filterpattern, const php_stream_filter_factory *factory);
+PHPAPI zend_result php_stream_filter_register_factory(const char *filterpattern, const php_stream_filter_factory *factory);
+PHPAPI zend_result php_stream_filter_unregister_factory(const char *filterpattern);
+PHPAPI zend_result php_stream_filter_register_factory_volatile(zend_string *filterpattern, const php_stream_filter_factory *factory);
 PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval *filterparams, uint8_t persistent);
 END_EXTERN_C()
diff --git a/main/streams/streams.c b/main/streams/streams.c
@@ -1869,7 +1869,7 @@ void php_shutdown_stream_hashes(void)
 	}
 }
 
-int php_init_stream_wrappers(int module_number)
+zend_result php_init_stream_wrappers(int module_number)
 {
 	le_stream = zend_register_list_destructors_ex(stream_resource_regular_dtor, NULL, "stream", module_number);
 	le_pstream = zend_register_list_destructors_ex(NULL, stream_resource_persistent_dtor, "persistent stream", module_number);
diff --git a/main/streams/userspace.c b/main/streams/userspace.c

Original file line number	Diff line number	Diff line change
`@@ -6388,7 +6388,7 @@ PHP_FUNCTION(pg_socket_poll)`
`6388`	`6388`	`Z_PARAM_LONG(ts)`
`6389`	`6389`	`ZEND_PARSE_PARAMETERS_END();`
`6390`	`6390`
`6391`		`- if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void **)&socket, 0)) {`
	`6391`	`+ if (UNEXPECTED(php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void **)&socket, 0) == FAILURE)) {`
`6392`	`6392`	`zend_argument_type_error(1, "invalid resource socket");`
`6393`	`6393`	`RETURN_THROWS();`
`6394`	`6394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2585,7 +2585,7 @@ PHP_FUNCTION(socket_import_stream)`
`2585`	`2585`	`ZEND_PARSE_PARAMETERS_END();`
`2586`	`2586`	`php_stream_from_zval(stream, zstream);`
`2587`	`2587`
`2588`		`- if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void**)&socket, 1)) {`
	`2588`	`+ if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void**)&socket, 1) == FAILURE) {`
`2589`	`2589`	`/* error supposedly already shown */`
`2590`	`2590`	`RETURN_FALSE;`
`2591`	`2591`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,22 +40,22 @@ PHPAPI HashTable *_php_get_stream_filters_hash(void)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/* API for registering GLOBAL filters */`
`43`		`-PHPAPI int php_stream_filter_register_factory(const char filterpattern, const php_stream_filter_factory factory)`
	`43`	`+PHPAPI zend_result php_stream_filter_register_factory(const char filterpattern, const php_stream_filter_factory factory)`
`44`	`44`	`{`
`45`		`- int ret;`
	`45`	`+ zend_result ret;`
`46`	`46`	`zend_string *str = zend_string_init_interned(filterpattern, strlen(filterpattern), true);`
`47`	`47`	`ret = zend_hash_add_ptr(&stream_filters_hash, str, (void*)factory) ? SUCCESS : FAILURE;`
`48`	`48`	`zend_string_release_ex(str, true);`
`49`	`49`	`return ret;`
`50`	`50`	`}`
`51`	`51`
`52`		`-PHPAPI int php_stream_filter_unregister_factory(const char *filterpattern)`
	`52`	`+PHPAPI zend_result php_stream_filter_unregister_factory(const char *filterpattern)`
`53`	`53`	`{`
`54`	`54`	`return zend_hash_str_del(&stream_filters_hash, filterpattern, strlen(filterpattern));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/* API for registering VOLATILE wrappers */`
`58`		`-PHPAPI int php_stream_filter_register_factory_volatile(zend_string filterpattern, const php_stream_filter_factory factory)`
	`58`	`+PHPAPI zend_result php_stream_filter_register_factory_volatile(zend_string filterpattern, const php_stream_filter_factory factory)`
`59`	`59`	`{`
`60`	`60`	`if (!FG(stream_filters)) {`
`61`	`61`	`ALLOC_HASHTABLE(FG(stream_filters));`
`@@ -282,7 +282,7 @@ PHPAPI void php_stream_filter_free(php_stream_filter *filter)`
`282`	`282`	`pefree(filter, filter->is_persistent);`
`283`	`283`	`}`
`284`	`284`
`285`		`-PHPAPI int php_stream_filter_prepend_ex(php_stream_filter_chain chain, php_stream_filter filter)`
	`285`	`+PHPAPI zend_result php_stream_filter_prepend_ex(php_stream_filter_chain chain, php_stream_filter filter)`
`286`	`286`	`{`
`287`	`287`	`filter->next = chain->head;`
`288`	`288`	`filter->prev = NULL;`
`@@ -303,7 +303,7 @@ PHPAPI void _php_stream_filter_prepend(php_stream_filter_chain *chain, php_strea`
`303`	`303`	`php_stream_filter_prepend_ex(chain, filter);`
`304`	`304`	`}`
`305`	`305`
`306`		`-PHPAPI int php_stream_filter_append_ex(php_stream_filter_chain chain, php_stream_filter filter)`
	`306`	`+PHPAPI zend_result php_stream_filter_append_ex(php_stream_filter_chain chain, php_stream_filter filter)`
`307`	`307`	`{`
`308`	`308`	`php_stream *stream = chain->stream;`
`309`	`309`
`@@ -395,7 +395,7 @@ PHPAPI void _php_stream_filter_append(php_stream_filter_chain *chain, php_stream`
`395`	`395`	`}`
`396`	`396`	`}`
`397`	`397`
`398`		`-PHPAPI int _php_stream_filter_flush(php_stream_filter *filter, bool finish)`
	`398`	`+PHPAPI zend_result _php_stream_filter_flush(php_stream_filter *filter, bool finish)`
`399`	`399`	`{`
`400`	`400`	`php_stream_bucket_brigade brig_a = { NULL, NULL }, brig_b = { NULL, NULL }, inp = &brig_a, outp = &brig_b, *brig_temp;`
`401`	`401`	`php_stream_bucket *bucket;`
Original file line number	Diff line number	Diff line change
`@@ -1869,7 +1869,7 @@ void php_shutdown_stream_hashes(void)`
`1869`	`1869`	`}`
`1870`	`1870`	`}`
`1871`	`1871`
`1872`		`-int php_init_stream_wrappers(int module_number)`
	`1872`	`+zend_result php_init_stream_wrappers(int module_number)`
`1873`	`1873`	`{`
`1874`	`1874`	`le_stream = zend_register_list_destructors_ex(stream_resource_regular_dtor, NULL, "stream", module_number);`
`1875`	`1875`	`le_pstream = zend_register_list_destructors_ex(NULL, stream_resource_persistent_dtor, "persistent stream", module_number);`