johannes Sun Mar 5 15:49:55 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
- Fix build after unicode changes
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.80&r2=1.81&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.80 php-src/ext/mysqli/mysqli.c:1.81
--- php-src/ext/mysqli/mysqli.c:1.80 Wed Mar 1 18:37:25 2006
+++ php-src/ext/mysqli/mysqli.c Sun Mar 5 15:49:55 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.80 2006/03/01 18:37:25 iliaa Exp $
+ $Id: mysqli.c,v 1.81 2006/03/05 15:49:55 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -215,7 +215,7 @@
if (ret == SUCCESS) {
/* check if mysqli object is still valid */
- if (!strcmp(obj->zo.ce->name, "mysqli")) {
+ if (!strcmp(obj->zo.ce->name.s, "mysqli")) {
if (!obj->ptr ||
!((MYSQL *)((MY_MYSQL *)((MYSQLI_RESOURCE
*)(obj->ptr))->ptr)->mysql)->thread_id) {
retval = EG(uninitialized_zval_ptr);
@@ -223,7 +223,7 @@
}
} else
/* check if stmt object is still valid */
- if (!strcmp(obj->zo.ce->name, "mysqli_stmt")) {
+ if (!strcmp(obj->zo.ce->name.s, "mysqli_stmt")) {
if (!obj->ptr ||
!((MYSQL_STMT *)((MY_STMT *)((MYSQLI_RESOURCE
*)(obj->ptr))->ptr)->stmt)->mysql) {
retval = EG(uninitialized_zval_ptr);
@@ -356,7 +356,7 @@
{
mysqli_base_class = mysqli_base_class->parent;
}
- zend_hash_find(&classes, mysqli_base_class->name,
mysqli_base_class->name_length + 1,
+ zend_hash_find(&classes, mysqli_base_class->name.s,
mysqli_base_class->name_length + 1,
(void **) &intern->prop_handler);
ALLOC_HASHTABLE(intern->zo.properties);
@@ -460,33 +460,33 @@
ce = mysqli_driver_class_entry;
zend_hash_init(&mysqli_driver_properties, 0, NULL, NULL, 1);
MYSQLI_ADD_PROPERTIES(&mysqli_driver_properties,
mysqli_driver_property_entries);
- zend_hash_add(&classes, ce->name, ce->name_length+1,
&mysqli_driver_properties, sizeof(mysqli_driver_properties), NULL);
+ zend_hash_add(&classes, ce->name.s, ce->name_length+1,
&mysqli_driver_properties, sizeof(mysqli_driver_properties), NULL);
ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
REGISTER_MYSQLI_CLASS_ENTRY("mysqli", mysqli_link_class_entry,
mysqli_link_methods);
ce = mysqli_link_class_entry;
zend_hash_init(&mysqli_link_properties, 0, NULL, NULL, 1);
MYSQLI_ADD_PROPERTIES(&mysqli_link_properties,
mysqli_link_property_entries);
- zend_hash_add(&classes, ce->name, ce->name_length+1,
&mysqli_link_properties, sizeof(mysqli_link_properties), NULL);
+ zend_hash_add(&classes, ce->name.s, ce->name_length+1,
&mysqli_link_properties, sizeof(mysqli_link_properties), NULL);
REGISTER_MYSQLI_CLASS_ENTRY("mysqli_warning",
mysqli_warning_class_entry, mysqli_warning_methods);
ce = mysqli_warning_class_entry;
ce->ce_flags |= ZEND_ACC_FINAL_CLASS | ZEND_ACC_PROTECTED;
zend_hash_init(&mysqli_warning_properties, 0, NULL, NULL, 1);
MYSQLI_ADD_PROPERTIES(&mysqli_warning_properties,
mysqli_warning_property_entries);
- zend_hash_add(&classes, ce->name, ce->name_length+1,
&mysqli_warning_properties, sizeof(mysqli_warning_properties), NULL);
+ zend_hash_add(&classes, ce->name.s, ce->name_length+1,
&mysqli_warning_properties, sizeof(mysqli_warning_properties), NULL);
REGISTER_MYSQLI_CLASS_ENTRY("mysqli_result", mysqli_result_class_entry,
mysqli_result_methods);
ce = mysqli_result_class_entry;
zend_hash_init(&mysqli_result_properties, 0, NULL, NULL, 1);
MYSQLI_ADD_PROPERTIES(&mysqli_result_properties,
mysqli_result_property_entries);
- zend_hash_add(&classes, ce->name, ce->name_length+1,
&mysqli_result_properties, sizeof(mysqli_result_properties), NULL);
+ zend_hash_add(&classes, ce->name.s, ce->name_length+1,
&mysqli_result_properties, sizeof(mysqli_result_properties), NULL);
REGISTER_MYSQLI_CLASS_ENTRY("mysqli_stmt", mysqli_stmt_class_entry,
mysqli_stmt_methods);
ce = mysqli_stmt_class_entry;
zend_hash_init(&mysqli_stmt_properties, 0, NULL, NULL, 1);
MYSQLI_ADD_PROPERTIES(&mysqli_stmt_properties,
mysqli_stmt_property_entries);
- zend_hash_add(&classes, ce->name, ce->name_length+1,
&mysqli_stmt_properties, sizeof(mysqli_stmt_properties), NULL);
+ zend_hash_add(&classes, ce->name.s, ce->name_length+1,
&mysqli_stmt_properties, sizeof(mysqli_stmt_properties), NULL);
/* mysqli_options */
REGISTER_LONG_CONSTANT("MYSQLI_READ_DEFAULT_GROUP",
MYSQL_READ_DEFAULT_GROUP, CONST_CS | CONST_PERSISTENT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
