helly Thu Dec 21 22:56:59 2006 UTC
Modified files:
/php-src/ext/spl spl_observer.c spl_sxe.c
Log:
- Mark a fewthings as unicode ready
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_observer.c?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/spl/spl_observer.c
diff -u php-src/ext/spl/spl_observer.c:1.13 php-src/ext/spl/spl_observer.c:1.14
--- php-src/ext/spl/spl_observer.c:1.13 Mon Dec 18 22:32:09 2006
+++ php-src/ext/spl/spl_observer.c Thu Dec 21 22:56:58 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_observer.c,v 1.13 2006/12/18 22:32:09 helly Exp $ */
+/* $Id: spl_observer.c,v 1.14 2006/12/21 22:56:58 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -141,7 +141,7 @@
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_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 @@
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 @@
#endif
} /* }}} */
-/* {{{ proto int SplObjectStorage::count()
+/* {{{ proto int SplObjectStorage::count() U
Determine number of objects in storage */
SPL_METHOD(SplObjectStorage, count)
{
@@ -215,7 +215,7 @@
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 @@
intern->index = 0;
} /* }}} */
-/* {{{ proto bool SplObjectStorage::valid()
+/* {{{ proto bool SplObjectStorage::valid() U
*/
SPL_METHOD(SplObjectStorage, valid)
{
@@ -234,7 +234,7 @@
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 @@
RETURN_LONG(intern->index);
} /* }}} */
-/* {{{ proto mixed SplObjectStorage::current()
+/* {{{ proto mixed SplObjectStorage::current() U
*/
SPL_METHOD(SplObjectStorage, current)
{
@@ -256,7 +256,7 @@
RETVAL_ZVAL(*entry, 1, 0);
} /* }}} */
-/* {{{ proto void SplObjectStorage::next()
+/* {{{ proto void SplObjectStorage::next() U
*/
SPL_METHOD(SplObjectStorage, next)
{
@@ -266,7 +266,7 @@
intern->index++;
} /* }}} */
-/* {{{ proto string SplObjectStorage::serialize()
+/* {{{ proto string SplObjectStorage::serialize() U
*/
SPL_METHOD(SplObjectStorage, serialize)
{
@@ -309,14 +309,14 @@
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)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_sxe.c?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/spl/spl_sxe.c
diff -u php-src/ext/spl/spl_sxe.c:1.17 php-src/ext/spl/spl_sxe.c:1.18
--- php-src/ext/spl/spl_sxe.c:1.17 Mon Mar 6 09:45:25 2006
+++ php-src/ext/spl/spl_sxe.c Thu Dec 21 22:56:58 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_sxe.c,v 1.17 2006/03/06 09:45:25 helly Exp $ */
+/* $Id: spl_sxe.c,v 1.18 2006/12/21 22:56:58 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -41,7 +41,7 @@
#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 @@
}
/* }}} */
-/* {{{ proto bool SimpleXMLIterator::valid()
+/* {{{ proto bool SimpleXMLIterator::valid() U
Check whether iteration is valid */
SPL_METHOD(SimpleXMLIterator, valid)
{
@@ -62,7 +62,7 @@
}
/* }}} */
-/* {{{ proto SimpleXMLIterator SimpleXMLIterator::current()
+/* {{{ proto SimpleXMLIterator SimpleXMLIterator::current() U
Get current element */
SPL_METHOD(SimpleXMLIterator, current)
{
@@ -76,7 +76,7 @@
}
/* }}} */
-/* {{{ proto string SimpleXMLIterator::key()
+/* {{{ proto string SimpleXMLIterator::key() U
Get name of current child element */
SPL_METHOD(SimpleXMLIterator, key)
{
@@ -98,7 +98,7 @@
}
/* }}} */
-/* {{{ proto void SimpleXMLIterator::next()
+/* {{{ proto void SimpleXMLIterator::next() U
Move to next element */
SPL_METHOD(SimpleXMLIterator, next)
{
@@ -109,7 +109,7 @@
}
/* }}} */
-/* {{{ proto bool SimpleXMLIterator::hasChildren()
+/* {{{ proto bool SimpleXMLIterator::hasChildren() U
Check whether element has children (elements) */
SPL_METHOD(SimpleXMLIterator, hasChildren)
{
@@ -133,7 +133,7 @@
}
/* }}} */
-/* {{{ proto SimpleXMLIterator SimpleXMLIterator::getChildren()
+/* {{{ proto SimpleXMLIterator SimpleXMLIterator::getChildren() U
Get child element iterator */
SPL_METHOD(SimpleXMLIterator, getChildren)
{
@@ -146,7 +146,7 @@
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)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
