cvs: php-src(PHP_4_4) /ext/standard ftp_fopen_wrapper.c

iliaa Wed Oct 12 10:46:09 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/ext/standard ftp_fopen_wrapper.c Log: Fixed compiler failure http://cvs.php.net/diff.php/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.38.2.8.2.3&r2=1.38.2.8.2.4&ty=u Index: php-src/ext/standard/ftp_fopen_wrapper.c diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.38.2.8.2.3 php-src/ext/standard/ftp_fopen_wrapper.c:1.38.2.8.2.4 --- php-src/ext/standard/ftp_fopen_wrapper.c:1.38.2.8.2.3 Tue Oct 11 10:41:39 2005 +++ php-src/ext/standard/ftp_fopen_wrapper.c Wed Oct 12 10:46:08 2005 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.38.2.8.2.3 2005/10/11 14:41:39 iliaa Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.38.2.8.2.4 2005/10/12 14:46:08 iliaa Exp $ */ #include "php.h" #include "php_globals.h" @@ -247,12 +247,11 @@ /* send the user name */ if (resource->user != NULL) { - unsigned char *s, *e; tmp_len = php_raw_url_decode(resource->user, strlen(resource->user)); PHP_FTP_CNTRL_CHK(resource->user, tmp_len, "Invalid login %s") - php_stream_printf(stream, TSRMLS_CC, "USER %s\r\n", resource->user); + php_stream_printf(stream TSRMLS_CC, "USER %s\r\n", resource->user); } else { php_stream_write_string(stream, "USER anonymous\r\n"); } @@ -269,12 +268,12 @@ PHP_FTP_CNTRL_CHK(resource->pass, tmp_len, "Invalid password %s") - php_stream_printf(stream, TSRMLS_CC, "PASS %s\r\n", resource->pass); + php_stream_printf(stream TSRMLS_CC, "PASS %s\r\n", resource->pass); } else { /* if the user has configured who they are, send that as the password */ if (cfg_get_string("from", &scratch) == SUCCESS) { - php_stream_printf(stream, TSRMLS_CC, "PASS %s\r\n", scratch); + php_stream_printf(stream TSRMLS_CC, "PASS %s\r\n", scratch); } else { php_stream_write_string(stream, "PASS anonymous\r\n"); } @@ -394,7 +393,7 @@ goto errexit; } - php_stream_printf(stream, TSRMLS_CC, "%s %s\r\n", (mode[0] == 'r' ? "RETR" : "STOR"), (resource->path != NULL ? resource->path : "/")); + php_stream_printf(stream TSRMLS_CC, "%s %s\r\n", (mode[0] == 'r' ? "RETR" : "STOR"), (resource->path != NULL ? resource->path : "/")); /* open the data channel */ if (hoststart == NULL) {