diff options
Diffstat (limited to 'ext/ftp')
| -rw-r--r-- | ext/ftp/ftp.c | 6 | ||||
| -rw-r--r-- | ext/ftp/php_ftp.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index b3548e70da..6a6caacaaf 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -866,7 +866,7 @@ ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, } while ((rcvd = my_recv(ftp, data->fd, data->buf, FTP_BUFSIZE))) { - if (rcvd == -1) { + if (rcvd == (size_t)-1) { goto bail; } @@ -1829,7 +1829,7 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path) lines = 0; lastch = 0; while ((rcvd = my_recv(ftp, data->fd, data->buf, FTP_BUFSIZE))) { - if (rcvd == -1 || rcvd > ((size_t)(-1))-size) { + if (rcvd == (size_t)-1 || rcvd > ((size_t)(-1))-size) { goto bail; } @@ -1958,7 +1958,7 @@ ftp_nb_continue_read(ftpbuf_t *ftp) lastch = ftp->lastch; if ((rcvd = my_recv(ftp, data->fd, data->buf, FTP_BUFSIZE))) { - if (rcvd == -1) { + if (rcvd == (size_t)-1) { goto bail; } diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 5bbca446b2..8afd3e2b6d 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -1491,7 +1491,7 @@ PHP_FUNCTION(ftp_set_option) RETURN_TRUE; break; default: - php_error_docref(NULL, E_WARNING, "Unknown option '%pd'", option); + php_error_docref(NULL, E_WARNING, "Unknown option '" ZEND_LONG_FMT "'", option); RETURN_FALSE; break; } @@ -1525,7 +1525,7 @@ PHP_FUNCTION(ftp_get_option) RETURN_BOOL(ftp->usepasvaddress); break; default: - php_error_docref(NULL, E_WARNING, "Unknown option '%pd'", option); + php_error_docref(NULL, E_WARNING, "Unknown option '" ZEND_LONG_FMT "'", option); RETURN_FALSE; break; } |