cvs: php4 /ext/domxml php_domxml.c
| From: | Sterling Hughes | Date: | Sun, 09 Sep 2001 09:51:02 +0000 |
| Subject: | cvs: php4 /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7324@lists.php.net to get a copy of this message | ||
sterling Sun Sep 9 05:51:02 2001 EDT
Modified files:
/php4/ext/domxml php_domxml.c
Log:
ws fix, MFB
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.71 php4/ext/domxml/php_domxml.c:1.72
--- php4/ext/domxml/php_domxml.c:1.71 Sun Sep 9 05:41:40 2001
+++ php4/ext/domxml/php_domxml.c Sun Sep 9 05:51:02 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.71 2001/09/09 09:41:40 sterling Exp $ */
+/* $Id: php_domxml.c,v 1.72 2001/09/09 09:51:02 sterling Exp $ */
#ifdef HAVE_CONFIG_H
@@ -394,18 +394,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 +497,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 +598,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 +611,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;
@@ -2791,4 +2791,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
*/