[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xml xml.c

[Rob Richards]

rrichards               Sun Jun 22 14:13:42 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/xml    xml.c 
  Log:
  fix parameter parsing change
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.157.2.4.2.5.2.5&r2=1.157.2.4.2.5.2.6&diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.157.2.4.2.5.2.5 
php-src/ext/xml/xml.c:1.157.2.4.2.5.2.6
--- php-src/ext/xml/xml.c:1.157.2.4.2.5.2.5     Sun Jun 22 13:22:27 2008
+++ php-src/ext/xml/xml.c       Sun Jun 22 14:13:41 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: xml.c,v 1.157.2.4.2.5.2.5 2008/06/22 13:22:27 felipe Exp $ */
+/* $Id: xml.c,v 1.157.2.4.2.5.2.6 2008/06/22 14:13:41 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -1346,23 +1346,18 @@
 PHP_FUNCTION(xml_parse)
 {
        xml_parser *parser;
-       zval *pind, **final;
+       zval *pind;
        char *data;
-       int data_len, argc, isFinal, ret;
+       int data_len, argc, ret;
+       long isFinal = 0;
 
        argc = ZEND_NUM_ARGS();
        
-       if (zend_parse_parameters(argc TSRMLS_CC, "rs|l", &pind, &data, 
&data_len, &final) == FAILURE) {
+       if (zend_parse_parameters(argc TSRMLS_CC, "rs|l", &pind, &data, 
&data_len, &isFinal) == FAILURE) {
                return;
        }
        ZEND_FETCH_RESOURCE(parser,xml_parser *, &pind, -1, "XML Parser", 
le_xml_parser);
 
-       if (argc == 3) {
-               isFinal = final;
-       } else {
-               isFinal = 0;
-       }
-
        parser->isparsing = 1;
        ret = XML_Parse(parser->parser, data, data_len, isFinal);
        parser->isparsing = 0;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php