sniper Sat Aug 13 21:17:52 2005 EDT
Modified files:
/php-src/ext/wddx php_wddx_api.h
/php-src/ext/wddx/tests 001.phpt bug27287.phpt
Log:
Missed some "de" to "un" changes
http://cvs.php.net/diff.php/php-src/ext/wddx/php_wddx_api.h?r1=1.23&r2=1.24&ty=u
Index: php-src/ext/wddx/php_wddx_api.h
diff -u php-src/ext/wddx/php_wddx_api.h:1.23
php-src/ext/wddx/php_wddx_api.h:1.24
--- php-src/ext/wddx/php_wddx_api.h:1.23 Wed Aug 3 10:08:20 2005
+++ php-src/ext/wddx/php_wddx_api.h Sat Aug 13 21:17:49 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_wddx_api.h,v 1.23 2005/08/03 14:08:20 sniper Exp $ */
+/* $Id: php_wddx_api.h,v 1.24 2005/08/14 01:17:49 sniper Exp $ */
#ifndef PHP_WDDX_API_H
#define PHP_WDDX_API_H
@@ -60,7 +60,7 @@
void php_wddx_packet_end(wddx_packet *packet);
void php_wddx_serialize_var(wddx_packet *packet, zval *var, char
*name, int name_len TSRMLS_DC);
-int php_wddx_deserialize_ex(char *, int, zval *return_value);
+int php_wddx_unserialize_ex(char *, int, zval *return_value);
#define php_wddx_gather(packet) estrndup(packet->c, packet->len)
#endif /* PHP_WDDX_API_H */
http://cvs.php.net/diff.php/php-src/ext/wddx/tests/001.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/wddx/tests/001.phpt
diff -u php-src/ext/wddx/tests/001.phpt:1.5 php-src/ext/wddx/tests/001.phpt:1.6
--- php-src/ext/wddx/tests/001.phpt:1.5 Sun Apr 4 14:07:36 2004
+++ php-src/ext/wddx/tests/001.phpt Sat Aug 13 21:17:52 2005
@@ -1,9 +1,9 @@
--TEST--
-wddx deserialization test
+wddx unserialization test
--FILE--
<?php
$path = dirname(__FILE__);
- var_dump(wddx_deserialize(file_get_contents("{$path}/wddx.xml")));
+ var_dump(wddx_unserialize(file_get_contents("{$path}/wddx.xml")));
?>
--EXPECT--
array(11) {
http://cvs.php.net/diff.php/php-src/ext/wddx/tests/bug27287.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/wddx/tests/bug27287.phpt
diff -u php-src/ext/wddx/tests/bug27287.phpt:1.1
php-src/ext/wddx/tests/bug27287.phpt:1.2
--- php-src/ext/wddx/tests/bug27287.phpt:1.1 Tue Feb 17 19:00:36 2004
+++ php-src/ext/wddx/tests/bug27287.phpt Sat Aug 13 21:17:52 2005
@@ -1,5 +1,5 @@
--TEST--
-Bug #27287 (segfault with deserializing object data)
+Bug #27287 (segfault with unserializing object data)
--FILE--
<?php
@@ -9,7 +9,7 @@
$foo->abc = 'def';
$string = wddx_serialize_value($foo);
- $bar = wddx_deserialize($string);
+ $bar = wddx_unserialize($string);
echo "OK\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
