diff options
| author | Andreas Streichardt <andreas.streichardt@gmail.com> | 2012-10-12 11:02:33 +0200 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-04 19:31:30 -0700 |
| commit | a93a462dcefd62e07963dd2da506fbb3409c88b5 (patch) | |
| tree | 84cf579dfe9f2bd1e0cf35108f7de975071ad069 /ext/ftp/php_ftp.c | |
| parent | 8d86597d7368460383a33a4399ea7a8b244cd6fa (diff) | |
| download | php-git-a93a462dcefd62e07963dd2da506fbb3409c88b5.tar.gz | |
First fixes for a 64bit compatible ftp extension
Diffstat (limited to 'ext/ftp/php_ftp.c')
| -rw-r--r-- | ext/ftp/php_ftp.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 73071936e0..da22e0b63e 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -784,8 +784,8 @@ PHP_FUNCTION(ftp_nb_fget) ftptype_t xtype; php_stream *stream; char *file; - int file_len, ret; - long mode, resumepos=0; + int file_len; + long mode, resumepos=0, ret; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) { return; @@ -968,9 +968,7 @@ PHP_FUNCTION(ftp_nb_get) RETURN_LONG(PHP_FTP_FAILED); } - if (ret == PHP_FTP_FINISHED) { - php_stream_close(outstream); - } + php_stream_close(outstream); RETURN_LONG(ret); } @@ -982,7 +980,7 @@ PHP_FUNCTION(ftp_nb_continue) { zval *z_ftp; ftpbuf_t *ftp; - int ret; + long ret; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ftp) == FAILURE) { return; @@ -1120,7 +1118,7 @@ PHP_FUNCTION(ftp_put) ftpbuf_t *ftp; ftptype_t xtype; char *remote, *local; - int remote_len, local_len; + long remote_len, local_len; long mode, startpos=0; php_stream *instream; @@ -1173,8 +1171,8 @@ PHP_FUNCTION(ftp_nb_put) ftpbuf_t *ftp; ftptype_t xtype; char *remote, *local; - int remote_len, local_len, ret; - long mode, startpos=0; + int remote_len, local_len; + long mode, startpos=0, ret; php_stream *instream; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) { |