tony2001 Thu Dec 21 22:50:57 2006 UTC
Modified files:
/php-src/ext/oci8 oci8_interface.c
Log:
temporary fix for oci_error(), just to make it work
it should be using add_ascii_assoc_text() instead
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.24&r2=1.25&diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.24
php-src/ext/oci8/oci8_interface.c:1.25
--- php-src/ext/oci8/oci8_interface.c:1.24 Thu Dec 21 22:08:02 2006
+++ php-src/ext/oci8/oci8_interface.c Thu Dec 21 22:50:57 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_interface.c,v 1.24 2006/12/21 22:08:02 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.25 2006/12/21 22:50:57 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1648,18 +1648,18 @@
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 {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
