diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-15 12:30:54 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-15 12:33:06 +0100 |
| commit | 3e01f5afb1b52fe26a956190296de0192eedeec1 (patch) | |
| tree | 77531ec93e3f3cef9891c77b5ca553eb8487f121 /ext/ftp | |
| parent | e2c8ab7c33ac5328485c43db5080c5bf4911ce38 (diff) | |
| download | php-git-3e01f5afb1b52fe26a956190296de0192eedeec1.tar.gz | |
Replace zend_bool uses with bool
We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.
Of course, zend_bool is retained as an alias.
Diffstat (limited to 'ext/ftp')
| -rw-r--r-- | ext/ftp/ftp.c | 8 | ||||
| -rw-r--r-- | ext/ftp/php_ftp.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 7ce3386c57..a10ef3a72a 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -232,7 +232,7 @@ ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pa SSL_CTX *ctx = NULL; long ssl_ctx_options = SSL_OP_ALL; int err, res; - zend_bool retry; + bool retry; #endif if (ftp == NULL) { return 0; @@ -1361,7 +1361,7 @@ ftp_getresp(ftpbuf_t *ftp) int single_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t size) { #ifdef HAVE_FTP_SSL int err; - zend_bool retry = 0; + bool retry = 0; SSL *handle = NULL; php_socket_t fd; size_t sent; @@ -1460,7 +1460,7 @@ my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) int n, nr_bytes; #ifdef HAVE_FTP_SSL int err; - zend_bool retry = 0; + bool retry = 0; SSL *handle = NULL; php_socket_t fd; #endif @@ -1745,7 +1745,7 @@ data_accept(databuf_t *data, ftpbuf_t *ftp) SSL_CTX *ctx; SSL_SESSION *session; int err, res; - zend_bool retry; + bool retry; #endif if (data->fd != -1) { diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 88a3cd02e7..2b944f04e6 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -495,7 +495,7 @@ PHP_FUNCTION(ftp_rawlist) ftpbuf_t *ftp; char **llist, **ptr, *dir; size_t dir_len; - zend_bool recursive = 0; + bool recursive = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|b", &z_ftp, php_ftp_ce, &dir, &dir_len, &recursive) == FAILURE) { RETURN_THROWS(); @@ -662,7 +662,7 @@ PHP_FUNCTION(ftp_pasv) { zval *z_ftp; ftpbuf_t *ftp; - zend_bool pasv; + bool pasv; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ob", &z_ftp, php_ftp_ce, &pasv) == FAILURE) { RETURN_THROWS(); |