[PHP-CVS] cvs: php-src /ext/oci8 oci8_interface.c

[Antony Dovgal]

tony2001                Sat Dec 23 14:10:35 2006 UTC

  Modified files:              
    /php-src/ext/oci8   oci8_interface.c 
  Log:
  use add_ascii_assoc_text()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.25 
php-src/ext/oci8/oci8_interface.c:1.26
--- php-src/ext/oci8/oci8_interface.c:1.25      Thu Dec 21 22:50:57 2006
+++ php-src/ext/oci8/oci8_interface.c   Sat Dec 23 14:10:35 2006
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8_interface.c,v 1.25 2006/12/21 22:50:57 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.26 2006/12/23 14:10:35 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1649,15 +1649,11 @@
        if (errcode) {
                array_init(return_value);
                add_ascii_assoc_long(return_value, "code", errcode);
-               if (UG(unicode)) {
-                       add_ascii_assoc_unicode(return_value, "message", (UChar 
*)errbuf, 0);
-               } else {
-                       add_assoc_string(return_value, "message", errbuf, 0);
-               }
+               add_ascii_assoc_text(return_value, "message", ZSTR((char 
*)errbuf), 0);
 #ifdef HAVE_OCI8_ATTR_STATEMENT
                add_ascii_assoc_long(return_value, "offset", error_offset);
                if (sqltext.v) {
-                       add_ascii_assoc_zstr(return_value, "sqltext", 
ZEND_STR_TYPE, sqltext, 1); /* XXX */
+                       add_ascii_assoc_text(return_value, "sqltext", sqltext, 
1);
                } else {
                        add_ascii_assoc_ascii_string(return_value, "sqltext", 
"", 1);
                }

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