cvs: php4(PHP_4_0_7) /ext/domxml php_domxml.c

sterling Sun Sep 9 05:48:16 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/domxml php_domxml.c Log: ws fix Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.67.2.4 php4/ext/domxml/php_domxml.c:1.67.2.5 --- php4/ext/domxml/php_domxml.c:1.67.2.4 Sun Sep 9 05:45:10 2001 +++ php4/ext/domxml/php_domxml.c Sun Sep 9 05:48:16 2001 @@ -16,8 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.67.2.4 2001/09/09 09:45:10 sterling Exp $ */ - +/* $Id: php_domxml.c,v 1.67.2.5 2001/09/09 09:48:16 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -394,18 +393,18 @@ if (Z_TYPE_P(wrapper) != IS_OBJECT) { php_error(E_WARNING, "Wrapper is not an object"); - return NULL; + return NULL; } if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) { php_error(E_WARNING, "Underlying object missing"); - return NULL; + return NULL; } obj = zend_list_find(Z_LVAL_PP(handle), &type); if (!obj || ((type != rsrc_type1) && (type != rsrc_type2))) { php_error(E_WARNING, "Underlying object missing or of invalid type"); - return NULL; + return NULL; } return obj; @@ -497,19 +496,19 @@ if (Z_TYPE_P(wrapper) != IS_OBJECT) { php_error(E_WARNING, "Wrapper is not an object"); - return NULL; + return NULL; } if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) { php_error(E_WARNING, "Underlying object missing"); - return NULL; + return NULL; } obj = zend_list_find(Z_LVAL_PP(handle), &type); if (!obj || ((type != rsrc_type1) && (type != rsrc_type2))) { php_error(E_WARNING, "Underlying object missing or of invalid type"); - return NULL; + return NULL; } return obj; @@ -598,12 +597,12 @@ if (Z_TYPE_P(wrapper) != IS_OBJECT) { php_error(E_WARNING, "Wrapper is not an object"); - return NULL; + return NULL; } if (zend_hash_index_find(Z_OBJPROP_P(wrapper), 0, (void **) &handle) == FAILURE) { php_error(E_WARNING, "Underlying object missing"); - return NULL; + return NULL; } obj = zend_list_find(Z_LVAL_PP(handle), &type); @@ -611,7 +610,7 @@ /* The following test should be replaced with search in all parents */ if (!obj) { /* || ((type != rsrc_type1) && (type != rsrc_type2))) { */ php_error(E_WARNING, "Underlying object missing or of invalid type"); - return NULL; + return NULL; } return obj; @@ -2790,4 +2789,6 @@ * tab-width: 4 * c-basic-offset: 4 * End: + * vim600: noet sw=4 ts=4 tw=78 fdm=marker + * vim<600: noet sw=4 ts=4 tw=78 */