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

ext/posix: changing helpers return to zend_result. (#13957)

Browse source
This commit is contained in:
David CARLIER 2024-04-13 22:04:55 +01:00 • committed by GitHub
parent 72b2524c58
commit 26c432d850
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/posix/posix.c
View file

@ -416,14 +416,14 @@ PHP_FUNCTION(posix_ctermid)
/* }}} */
/* Checks if the provides resource is a stream and if it provides a file descriptor */
static int php_posix_stream_get_fd(zval *zfp, zend_long *fd) /* {{{ */
static zend_result php_posix_stream_get_fd(zval *zfp, zend_long *fd) /* {{{ */
{
php_stream *stream;
php_stream_from_zval_no_verify(stream, zfp);
if (stream == NULL) {
return 0;
return FAILURE;
}
/* get the fd.
@ -437,9 +437,9 @@ static int php_posix_stream_get_fd(zval *zfp, zend_long *fd) /* {{{ */
} else {
php_error_docref(NULL, E_WARNING, "Could not use stream of type '%s'",
stream->ops->label);
return 0;
return FAILURE;
}
return 1;
return SUCCESS;
}
/* }}} */
@ -459,7 +459,7 @@ PHP_FUNCTION(posix_ttyname)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE_P(z_fd) == IS_RESOURCE) {
if (!php_posix_stream_get_fd(z_fd, &fd)) {
if (php_posix_stream_get_fd(z_fd, &fd) == FAILURE) {
RETURN_FALSE;
}
} else {
@ -520,7 +520,7 @@ PHP_FUNCTION(posix_isatty)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE_P(z_fd) == IS_RESOURCE) {
if (!php_posix_stream_get_fd(z_fd, &fd)) {
if (php_posix_stream_get_fd(z_fd, &fd) == FAILURE) {
RETURN_FALSE;
}
} else {
@ -1044,7 +1044,7 @@ try_again:
#define UNLIMITED_STRING "unlimited"
/* {{{ posix_addlimit */
static int posix_addlimit(int limit, const char *name, zval *return_value) {
static zend_result posix_addlimit(int limit, const char *name, zval *return_value) {
int result;
struct rlimit rl;
char hard[80];
@ -1316,7 +1316,7 @@ PHP_FUNCTION(posix_fpathconf)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE_P(z_fd) == IS_RESOURCE) {
if (!php_posix_stream_get_fd(z_fd, &fd)) {
if (php_posix_stream_get_fd(z_fd, &fd) == FAILURE) {
RETURN_FALSE;
}
} else {