[PHP-CVS] cvs: php-src /ext/dom namednodemap.c

[Marcus Boerger]

helly           Mon Mar 29 16:05:17 2004 EDT

  Modified files:              
    /php-src/ext/dom    namednodemap.c 
  Log:
  DOM_RET_OBJ for return_value needs to be followed by return
  
http://cvs.php.net/diff.php/php-src/ext/dom/namednodemap.c?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/dom/namednodemap.c
diff -u php-src/ext/dom/namednodemap.c:1.10 php-src/ext/dom/namednodemap.c:1.11
--- php-src/ext/dom/namednodemap.c:1.10 Mon Mar 29 14:57:48 2004
+++ php-src/ext/dom/namednodemap.c      Mon Mar 29 16:05:16 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: namednodemap.c,v 1.10 2004/03/29 19:57:48 iliaa Exp $ */
+/* $Id: namednodemap.c,v 1.11 2004/03/29 21:05:16 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -132,6 +132,7 @@
 
        if (itemnode) {
                DOM_RET_OBJ(rv, itemnode, &ret, objmap->baseobj);
+               return;
        } else {
                RETVAL_NULL();
        }
@@ -179,7 +180,6 @@
        if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", 
&id, dom_namednodemap_class_entry, &index) == FAILURE) {
                return;
        }
-
        if (index >= 0) {
                intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
 
@@ -208,6 +208,7 @@
 
                if (itemnode) {
                        DOM_RET_OBJ(rv, itemnode, &ret, objmap->baseobj);
+                       return;
                }
        }
 
@@ -258,6 +259,7 @@
 
        if (itemnode) {
                DOM_RET_OBJ(rv, itemnode, &ret, objmap->baseobj);
+               return;
        } else {
                RETVAL_NULL();
        }

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