ddhill Mon Mar 10 10:52:11 2003 EDT
Modified files:
/php4/ext/ftp php_ftp.c
/php4/ext/sockets sockets.c
Log:
fixing missed int to long with zend_parse_parameters
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.85 php4/ext/ftp/php_ftp.c:1.86
--- php4/ext/ftp/php_ftp.c:1.85 Thu Mar 6 18:07:24 2003
+++ php4/ext/ftp/php_ftp.c Mon Mar 10 10:52:10 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ftp.c,v 1.85 2003/03/06 23:07:24 ddhill Exp $ */
+/* $Id: php_ftp.c,v 1.86 2003/03/10 15:52:10 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -412,7 +412,8 @@
zval *z_ftp;
ftpbuf_t *ftp;
char *filename;
- int mode, filename_len;
+ int filename_len;
+ long mode;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rls", &z_ftp, &mode,
&filename, &filename_len) == FAILURE) {
RETURN_FALSE;
@@ -518,7 +519,8 @@
ftptype_t xtype;
php_stream *stream;
char *file;
- int file_len, mode, resumepos=0;
+ int file_len;
+ long mode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp,
&z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
return;
@@ -561,7 +563,8 @@
ftptype_t xtype;
php_stream *stream;
char *file;
- int file_len, mode, resumepos=0, ret;
+ int file_len, ret;
+ long mode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp,
&z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
return;
@@ -630,7 +633,8 @@
ftptype_t xtype;
php_stream *outstream;
char *local, *remote;
- int local_len, remote_len, mode, resumepos=0;
+ int local_len, remote_len;
+ long mode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssl|l", &z_ftp, &local,
&local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
return;
@@ -687,7 +691,8 @@
ftptype_t xtype;
php_stream *outstream;
char *local, *remote;
- int local_len, remote_len, mode, resumepos=0, ret;
+ int local_len, remote_len, ret;
+ long mode, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssl|l", &z_ftp, &local,
&local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
return;
@@ -786,7 +791,8 @@
zval *z_ftp, *z_file;
ftpbuf_t *ftp;
ftptype_t xtype;
- int mode, remote_len, startpos=0;
+ int remote_len;
+ long mode, startpos=0;
php_stream *stream;
char *remote;
@@ -832,7 +838,8 @@
zval *z_ftp, *z_file;
ftpbuf_t *ftp;
ftptype_t xtype;
- int mode, remote_len, startpos=0, ret;
+ int remote_len, ret;
+ long mode, startpos=0;
php_stream *stream;
char *remote;
@@ -884,7 +891,8 @@
ftpbuf_t *ftp;
ftptype_t xtype;
char *remote, *local;
- int remote_len, local_len, mode, startpos=0;
+ int remote_len, local_len;
+ long mode, startpos=0;
php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssl|l", &z_ftp,
&remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
@@ -936,7 +944,8 @@
ftpbuf_t *ftp;
ftptype_t xtype;
char *remote, *local;
- int remote_len, local_len, mode, startpos=0, ret;
+ int remote_len, local_len, ret;
+ long mode, startpos=0;
php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssl|l", &z_ftp,
&remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.132 php4/ext/sockets/sockets.c:1.133
--- php4/ext/sockets/sockets.c:1.132 Thu Mar 6 18:07:26 2003
+++ php4/ext/sockets/sockets.c Mon Mar 10 10:52:10 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.132 2003/03/06 23:07:26 ddhill Exp $ */
+/* $Id: sockets.c,v 1.133 2003/03/10 15:52:10 ddhill Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1027,7 +1027,7 @@
php_socket *php_sock;
char *addr;
int addr_len;
- int port = 0;
+ long port = 0;
long retval = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &arg1, &addr,
&addr_len, &port) == FAILURE)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
