From 96d19377ce3a238b474abee62a17aca3adc2f44d Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Sat, 23 Dec 2006 14:10:35 +0000 Subject: [PATCH] use add_ascii_assoc_text() --- ext/oci8/oci8_interface.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index dee6520348..95995a7b82 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -1649,15 +1649,11 @@ PHP_FUNCTION(oci_error) 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); } -- 2.50.1