sesser Sat Jun 19 11:09:48 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/domxml php_domxml.c
/php-src/ext/ncurses ncurses_functions.c
/php-src/ext/w32api w32api.c
Log:
Fixed some 64bit and other zend_parse_parameters bugs
http://cvs.php.net/diff.php/php-src/ext/domxml/php_domxml.c?r1=1.218.2.46&r2=1.218.2.47&ty=u
Index: php-src/ext/domxml/php_domxml.c
diff -u php-src/ext/domxml/php_domxml.c:1.218.2.46
php-src/ext/domxml/php_domxml.c:1.218.2.47
--- php-src/ext/domxml/php_domxml.c:1.218.2.46 Tue Apr 6 13:56:11 2004
+++ php-src/ext/domxml/php_domxml.c Sat Jun 19 11:09:46 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.218.2.46 2004/04/06 17:56:11 rrichards Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.47 2004/06/19 15:09:46 sesser Exp $ */
/* TODO
* - Support Notation Nodes
@@ -5360,7 +5360,8 @@
xmlDocPtr xmldocp;
xmlDocPtr docp;
char **params = NULL;
- int ret, clone = -1;
+ int ret;
+ long clone = -1;
char *filename;
int filename_len = 0;
FILE *f;
http://cvs.php.net/diff.php/php-src/ext/ncurses/ncurses_functions.c?r1=1.26.2.8&r2=1.26.2.9&ty=u
Index: php-src/ext/ncurses/ncurses_functions.c
diff -u php-src/ext/ncurses/ncurses_functions.c:1.26.2.8
php-src/ext/ncurses/ncurses_functions.c:1.26.2.9
--- php-src/ext/ncurses/ncurses_functions.c:1.26.2.8 Fri Jun 6 14:50:46 2003
+++ php-src/ext/ncurses/ncurses_functions.c Sat Jun 19 11:09:47 2004
@@ -1421,7 +1421,7 @@
{
long y,x;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls",&y,&x)==FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll",&y,&x)==FAILURE) {
return;
}
IS_NCURSES_INITIALIZED();
@@ -1436,7 +1436,7 @@
{
long y,x;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls",&y,&x)==FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll",&y,&x)==FAILURE) {
return;
}
IS_NCURSES_INITIALIZED();
@@ -1450,7 +1450,7 @@
{
long y,x;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lls",&y,&x)==FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ll",&y,&x)==FAILURE) {
return;
}
IS_NCURSES_INITIALIZED();
http://cvs.php.net/diff.php/php-src/ext/w32api/w32api.c?r1=1.5.2.2&r2=1.5.2.3&ty=u
Index: php-src/ext/w32api/w32api.c
diff -u php-src/ext/w32api/w32api.c:1.5.2.2 php-src/ext/w32api/w32api.c:1.5.2.3
--- php-src/ext/w32api/w32api.c:1.5.2.2 Wed Apr 16 16:03:13 2003
+++ php-src/ext/w32api/w32api.c Sat Jun 19 11:09:47 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: w32api.c,v 1.5.2.2 2003/04/16 20:03:13 moriyoshi Exp $ */
+/* $Id: w32api.c,v 1.5.2.3 2004/06/19 15:09:47 sesser Exp $ */
/*
* Win32 API Extension for PHP 4
@@ -1509,7 +1509,7 @@
int function_name_len;
w32api_func_handle **fh = NULL;
- if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
+ if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&function_name,
&function_name_len) ==
FAILURE)
{
@@ -1535,7 +1535,7 @@
int function_definition_len;
w32api_func_handle **fh = NULL;
- if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l",
+ if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
&function_definition,
&function_definition_len) ==
FAILURE)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
