]> granicus.if.org Git - php/commitdiff
temporary fix for oci_error(), just to make it work
authorAntony Dovgal <tony2001@php.net>
Thu, 21 Dec 2006 22:50:57 +0000 (22:50 +0000)
committerAntony Dovgal <tony2001@php.net>
Thu, 21 Dec 2006 22:50:57 +0000 (22:50 +0000)
it should be using add_ascii_assoc_text() instead

ext/oci8/oci8_interface.c

index 7cc5315c4e70c7ad8bf3553e9ef32795871b2330..dee65203480bc636a0ef049e10b49a76acab686b 100644 (file)
@@ -1648,18 +1648,18 @@ PHP_FUNCTION(oci_error)
 
        if (errcode) {
                array_init(return_value);
-               add_assoc_long(return_value, "code", errcode);
+               add_ascii_assoc_long(return_value, "code", errcode);
                if (UG(unicode)) {
-                       add_assoc_unicode(return_value, "message", (UChar *)errbuf, 0);
+                       add_ascii_assoc_unicode(return_value, "message", (UChar *)errbuf, 0);
                } else {
                        add_assoc_string(return_value, "message", errbuf, 0);
                }
 #ifdef HAVE_OCI8_ATTR_STATEMENT
-               add_assoc_long(return_value, "offset", error_offset);
+               add_ascii_assoc_long(return_value, "offset", error_offset);
                if (sqltext.v) {
-                       add_assoc_text(return_value, "sqltext", sqltext, 1);
+                       add_ascii_assoc_zstr(return_value, "sqltext", ZEND_STR_TYPE, sqltext, 1); /* XXX */
                } else {
-                       add_assoc_ascii_string(return_value, "sqltext", "", 1);
+                       add_ascii_assoc_ascii_string(return_value, "sqltext", "", 1);
                }
 #endif
        } else {