[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/file pathinfo_variation2.phpt

[Felipe Pena]

felipe          Sun Dec 28 20:16:48 2008 UTC

  Modified files:              
    /php-src/ext/standard       string.c 
    /php-src/ext/standard/tests/file    pathinfo_variation2.phpt 
  Log:
  - Unicodify (#46687)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.687&r2=1.688&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.687 php-src/ext/standard/string.c:1.688
--- php-src/ext/standard/string.c:1.687 Sat Dec 27 05:13:29 2008
+++ php-src/ext/standard/string.c       Sun Dec 28 20:16:48 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.687 2008/12/27 05:13:29 shire Exp $ */
+/* $Id: string.c,v 1.688 2008/12/28 20:16:48 felipe Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -2129,7 +2129,7 @@
                if (zend_hash_get_current_data(Z_ARRVAL_P(tmp), (void **) 
&element) == SUCCESS) {
                        RETVAL_ZVAL(*element, 1, 0);
                } else {
-                       ZVAL_EMPTY_STRING(return_value);
+                       ZVAL_EMPTY_UNICODE(return_value);
                }
        }
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/pathinfo_variation2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/pathinfo_variation2.phpt
diff -u php-src/ext/standard/tests/file/pathinfo_variation2.phpt:1.2 
php-src/ext/standard/tests/file/pathinfo_variation2.phpt:1.3
--- php-src/ext/standard/tests/file/pathinfo_variation2.phpt:1.2        Wed Nov 
26 17:48:40 2008
+++ php-src/ext/standard/tests/file/pathinfo_variation2.phpt    Sun Dec 28 
20:16:48 2008
@@ -122,7 +122,7 @@
 unicode(%d) %s
 
 --float .5--
-string(0) ""
+unicode(0) ""
 
 --empty array--
 Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d)
@@ -141,22 +141,22 @@
 NULL
 
 --uppercase NULL--
-string(0) ""
+unicode(0) ""
 
 --lowercase null--
-string(0) ""
+unicode(0) ""
 
 --lowercase true--
 unicode(17) "/usr/include/arpa"
 
 --lowercase false--
-string(0) ""
+unicode(0) ""
 
 --uppercase TRUE--
 unicode(17) "/usr/include/arpa"
 
 --uppercase FALSE--
-string(0) ""
+unicode(0) ""
 
 --empty string DQ--
 Error: 2 - pathinfo() expects parameter 2 to be long, Unicode string given, 
%s(%d)
@@ -191,9 +191,9 @@
 NULL
 
 --undefined var--
-string(0) ""
+unicode(0) ""
 
 --unset var--
-string(0) ""
+unicode(0) ""
 ===DONE===
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php