From: Marcus Boerger <helly@php.net>
Date: Thu, 21 Dec 2006 22:56:58 +0000 (+0000)
Subject: - Mark a fewthings as unicode ready
X-Git-Tag: RELEASE_1_0_0RC1~562
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=483aae664640154285be998da07a0e7e60ebd898;p=php

- Mark a fewthings as unicode ready
---

diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 49263bade5..ac48ef6cfc 100755
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -141,7 +141,7 @@ void spl_object_storage_attach(spl_SplObjectStorage *intern, zval *obj TSRMLS_DC
 	obj->refcount++;
 } /* }}} */
 
-/* {{{ proto void SplObjectStorage::attach($obj)
+/* {{{ proto void SplObjectStorage::attach($obj) U
  Attaches an object to the storage if not yet contained */
 SPL_METHOD(SplObjectStorage, attach)
 {
@@ -155,7 +155,7 @@ SPL_METHOD(SplObjectStorage, attach)
 	spl_object_storage_attach(intern, obj TSRMLS_CC);
 } /* }}} */
 
-/* {{{ proto void SplObjectStorage::detach($obj)
+/* {{{ proto void SplObjectStorage::detach($obj) U
  Detaches an object from the storage */
 SPL_METHOD(SplObjectStorage, detach)
 {
@@ -182,7 +182,7 @@ SPL_METHOD(SplObjectStorage, detach)
 	intern->index = 0;
 } /* }}} */
 
-/* {{{ proto bool SplObjectStorage::contains($obj)
+/* {{{ proto bool SplObjectStorage::contains($obj) U
  Determine whethe an object is contained in the storage */
 SPL_METHOD(SplObjectStorage, contains)
 {
@@ -206,7 +206,7 @@ SPL_METHOD(SplObjectStorage, contains)
 #endif
 } /* }}} */
 
-/* {{{ proto int SplObjectStorage::count()
+/* {{{ proto int SplObjectStorage::count() U
  Determine number of objects in storage */
 SPL_METHOD(SplObjectStorage, count)
 {
@@ -215,7 +215,7 @@ SPL_METHOD(SplObjectStorage, count)
 	RETURN_LONG(zend_hash_num_elements(&intern->storage));
 } /* }}} */
 
-/* {{{ proto void SplObjectStorage::rewind()
+/* {{{ proto void SplObjectStorage::rewind() U
  */
 SPL_METHOD(SplObjectStorage, rewind)
 {
@@ -225,7 +225,7 @@ SPL_METHOD(SplObjectStorage, rewind)
 	intern->index = 0;
 } /* }}} */
 
-/* {{{ proto bool SplObjectStorage::valid()
+/* {{{ proto bool SplObjectStorage::valid() U
  */
 SPL_METHOD(SplObjectStorage, valid)
 {
@@ -234,7 +234,7 @@ SPL_METHOD(SplObjectStorage, valid)
 	RETURN_BOOL(zend_hash_has_more_elements_ex(&intern->storage, &intern->pos) == SUCCESS);
 } /* }}} */
 
-/* {{{ proto mixed SplObjectStorage::key()
+/* {{{ proto mixed SplObjectStorage::key() U
  */
 SPL_METHOD(SplObjectStorage, key)
 {
@@ -243,7 +243,7 @@ SPL_METHOD(SplObjectStorage, key)
 	RETURN_LONG(intern->index);
 } /* }}} */
 
-/* {{{ proto mixed SplObjectStorage::current()
+/* {{{ proto mixed SplObjectStorage::current() U
  */
 SPL_METHOD(SplObjectStorage, current)
 {
@@ -256,7 +256,7 @@ SPL_METHOD(SplObjectStorage, current)
 	RETVAL_ZVAL(*entry, 1, 0);
 } /* }}} */
 
-/* {{{ proto void SplObjectStorage::next()
+/* {{{ proto void SplObjectStorage::next() U
  */
 SPL_METHOD(SplObjectStorage, next)
 {
@@ -266,7 +266,7 @@ SPL_METHOD(SplObjectStorage, next)
 	intern->index++;
 } /* }}} */
 
-/* {{{ proto string SplObjectStorage::serialize()
+/* {{{ proto string SplObjectStorage::serialize() U
  */
 SPL_METHOD(SplObjectStorage, serialize)
 {
@@ -309,14 +309,14 @@ SPL_METHOD(SplObjectStorage, serialize)
 	PHP_VAR_SERIALIZE_DESTROY(var_hash);
 
 	if (buf.c) {
-		RETURN_ASCII_STRINGL(buf.c, buf.len, ZSTR_AUTOFREE);
+		RETURN_STRINGL(buf.c, buf.len, 0);
 	} else {
 		RETURN_NULL();
 	}
 	
 } /* }}} */
 
-/* {{{ proto void SplObjectStorage::unserialize(string serialized)
+/* {{{ proto void SplObjectStorage::unserialize(string serialized) U
  */
 SPL_METHOD(SplObjectStorage, unserialize)
 {
diff --git a/ext/spl/spl_sxe.c b/ext/spl/spl_sxe.c
index 6eafd26ef6..a330661566 100755
--- a/ext/spl/spl_sxe.c
+++ b/ext/spl/spl_sxe.c
@@ -41,7 +41,7 @@ zend_class_entry *spl_ce_SimpleXMLElement;
 
 #include "ext/simplexml/php_simplexml_exports.h"
 
-/* {{{ proto void SimpleXMLIterator::rewind()
+/* {{{ proto void SimpleXMLIterator::rewind() U
  Rewind to first element */
 SPL_METHOD(SimpleXMLIterator, rewind)
 {
@@ -52,7 +52,7 @@ SPL_METHOD(SimpleXMLIterator, rewind)
 }
 /* }}} */
 
-/* {{{ proto bool SimpleXMLIterator::valid()
+/* {{{ proto bool SimpleXMLIterator::valid() U
  Check whether iteration is valid */
 SPL_METHOD(SimpleXMLIterator, valid)
 {
@@ -62,7 +62,7 @@ SPL_METHOD(SimpleXMLIterator, valid)
 }
 /* }}} */
 
-/* {{{ proto SimpleXMLIterator SimpleXMLIterator::current()
+/* {{{ proto SimpleXMLIterator SimpleXMLIterator::current() U
  Get current element */
 SPL_METHOD(SimpleXMLIterator, current)
 {
@@ -76,7 +76,7 @@ SPL_METHOD(SimpleXMLIterator, current)
 }
 /* }}} */
 
-/* {{{ proto string SimpleXMLIterator::key()
+/* {{{ proto string SimpleXMLIterator::key() U
  Get name of current child element */
 SPL_METHOD(SimpleXMLIterator, key)
 {
@@ -98,7 +98,7 @@ SPL_METHOD(SimpleXMLIterator, key)
 }
 /* }}} */
 
-/* {{{ proto void SimpleXMLIterator::next()
+/* {{{ proto void SimpleXMLIterator::next() U
  Move to next element */
 SPL_METHOD(SimpleXMLIterator, next)
 {
@@ -109,7 +109,7 @@ SPL_METHOD(SimpleXMLIterator, next)
 }
 /* }}} */
 
-/* {{{ proto bool SimpleXMLIterator::hasChildren()
+/* {{{ proto bool SimpleXMLIterator::hasChildren() U
  Check whether element has children (elements) */ 
 SPL_METHOD(SimpleXMLIterator, hasChildren)
 {
@@ -133,7 +133,7 @@ SPL_METHOD(SimpleXMLIterator, hasChildren)
 }
 /* }}} */
 
-/* {{{ proto SimpleXMLIterator SimpleXMLIterator::getChildren()
+/* {{{ proto SimpleXMLIterator SimpleXMLIterator::getChildren() U
  Get child element iterator */ 
 SPL_METHOD(SimpleXMLIterator, getChildren)
 {
@@ -146,7 +146,7 @@ SPL_METHOD(SimpleXMLIterator, getChildren)
 	return_value->value.obj = zend_objects_store_clone_obj(sxe->iter.data TSRMLS_CC);
 }
 
-/* {{{ proto int SimpleXMLIterator::count()
+/* {{{ proto int SimpleXMLIterator::count() U
  Get number of child elements */
 SPL_METHOD(SimpleXMLIterator, count)
 {