[PHP-CVS] cvs: php4 /ext/domxml php_domxml.c

[Ilia Alshanetsky]

iliaa           Tue Jan 14 15:07:55 2003 EDT

  Modified files:              
    /php4/ext/domxml    php_domxml.c 
  Log:
  Changed getParameters() to zend_get_parameters_ex().
  
  
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.233 php4/ext/domxml/php_domxml.c:1.234
--- php4/ext/domxml/php_domxml.c:1.233  Mon Jan 13 03:19:50 2003
+++ php4/ext/domxml/php_domxml.c        Tue Jan 14 15:07:52 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_domxml.c,v 1.233 2003/01/13 08:19:50 derick Exp $ */
+/* $Id: php_domxml.c,v 1.234 2003/01/14 20:07:52 iliaa Exp $ */
 
 /* TODO
  * - Support Notation Nodes
@@ -1636,13 +1636,14 @@
    Unity function for testing */
 PHP_FUNCTION(domxml_test)
 {
-       zval *id;
+       zval **id;
 
-       if ((ZEND_NUM_ARGS() != 1) || getParameters(ht, 1, &id) == FAILURE)
+       if (ZEND_NUM_ARGS() != 1 || (zend_get_parameters_ex(1, &id) == FAILURE)) {
                WRONG_PARAM_COUNT;
+       }
 
-       convert_to_long(id);
-       RETURN_LONG(Z_LVAL_P(id));
+       convert_to_long_ex(id);
+       RETURN_LONG(Z_LVAL_PP(id));
 }
 /* }}} */
 
@@ -2854,18 +2855,18 @@
 /* since this function is not implemented, outcomment it for the time beeing
 PHP_FUNCTION(domxml_elem_set_attribute_node)
 {
-       zval *id, *arg1, *rv = NULL;
+       zval *id, **arg1, *rv = NULL;
        xmlNode *nodep;
        xmlAttr *attrp, *newattrp;
        int ret;
 
-       if ((ZEND_NUM_ARGS() == 1) && getParameters(ht, 1, &arg1) == SUCCESS) {
-               id = getThis();
-               nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
-               attrp = php_dom_get_object(arg1, le_domxmlattrp, 0 TSRMLS_CC);
-       } else {
+       if ((ZEND_NUM_ARGS() == 1) && (zend_get_parameters_ex(1, &arg1) == FAILURE) {
                WRONG_PARAM_COUNT;
        }
+
+       id = getThis();
+       nodep = php_dom_get_object(id, le_domxmlelementp, 0 TSRMLS_CC);
+       attrp = php_dom_get_object(*arg1, le_domxmlattrp, 0 TSRMLS_CC);
 
        FIXME: The following line doesn't work 
        newattrp = xmlCopyProp(nodep, attrp);



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