Fix compiler warnings

Update tests

6 files changed, 12 insertions, 19 deletions

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 7749013ff3..acf547b960 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1077,15 +1077,6 @@ sxe_object_clone(void *object, void **clone_ptr TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ _free_ns_entry()
- */
-static void
-_free_ns_entry(void *p, xmlChar *data)
-{
-	xmlFree(p);
-}
-/* }}} */
-
 /* {{{ sxe_object_free_storage()
  */
 static void sxe_object_free_storage(void *object TSRMLS_DC)
@@ -1150,7 +1141,7 @@ php_sxe_register_object(php_sxe_object *intern TSRMLS_DC)
 {
 	zend_object_value rv;
 
-	rv.handle = zend_objects_store_put(intern, NULL, sxe_object_free_storage, sxe_object_clone TSRMLS_CC);
+	rv.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t)sxe_object_free_storage, sxe_object_clone TSRMLS_CC);
 	rv.handlers = (zend_object_handlers *) &sxe_object_handlers;
 
 	return rv;
diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt
index 4c559d8a15..97bd99b23c 100644
--- a/ext/simplexml/tests/014.phpt
+++ b/ext/simplexml/tests/014.phpt
@@ -53,5 +53,7 @@ object(simplexml_element)#%d (1) {
   [0]=>
   string(2) "30"
 }
-
-Fatal error: Unsupported operand types in %s014.php on line %d
+object(simplexml_element)#%d (1) {
+  [0]=>
+  string(2) "35"
+}
diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt
index 5f2e15a74f..dd359addac 100755
--- a/ext/simplexml/tests/014a.phpt
+++ b/ext/simplexml/tests/014a.phpt
@@ -48,9 +48,9 @@ object(simplexml_element)#%d (1) {
 NULL
 bool(false)
 ---Unsupported---
+NULL
 object(simplexml_element)#%d (1) {
   [0]=>
-  string(2) "30"
+  string(1) "5"
 }
-
-Fatal error: Unsupported operand types in %s014.php on line %d
+===DONE===
\ No newline at end of file
diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt
index 2452a1468c..925ad39173 100755
--- a/ext/simplexml/tests/014b.phpt
+++ b/ext/simplexml/tests/014b.phpt
@@ -50,7 +50,6 @@ bool(false)
 ---Unsupported---
 object(simplexml_element)#%d (1) {
   [0]=>
-  string(2) "30"
+  string(1) "5"
 }
-
-Fatal error: Unsupported operand types in %s014.php on line %d
+===DONE===
\ No newline at end of file
diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt
index 65870408ef..b8dde2a48a 100644
--- a/ext/simplexml/tests/016.phpt
+++ b/ext/simplexml/tests/016.phpt
@@ -54,4 +54,4 @@ object(simplexml_element)#%d (1) {
   [0]=>
   string(9) "JoeFooBar"
 }
-===Done===
+===DONE===
diff --git a/ext/simplexml/tests/bug27010.phpt b/ext/simplexml/tests/bug27010.phpt
index dffb7476b6..9ba9f7b6bd 100755
--- a/ext/simplexml/tests/bug27010.phpt
+++ b/ext/simplexml/tests/bug27010.phpt
@@ -21,6 +21,7 @@ foreach ($sxe as $element_name => $element) {
 foreach ($sxe->children('http://www.example.com/hot') as $element_name => $element) {
     print "$element_name is $element->name\n";
 }
+
 ?>
 ===DONE===
 --EXPECT--