cvs: php4 /ext/dbx dbx.c /ext/dotnet dotnet.cpp /ext/fbsql php_fbsql.c /ext/ming ming.c /ext/qtdom qtdom.c /ext/sybase_ct php_sybase_ct.c

andi Mon Aug 13 12:40:05 2001 EDT Modified files: /php4/ext/dbx dbx.c /php4/ext/dotnet dotnet.cpp /php4/ext/fbsql php_fbsql.c /php4/ext/ming ming.c /php4/ext/qtdom qtdom.c /php4/ext/sybase_ct php_sybase_ct.c Log: - ZE2 fixes

Index: php4/ext/dbx/dbx.c diff -u php4/ext/dbx/dbx.c:1.21 php4/ext/dbx/dbx.c:1.22 --- php4/ext/dbx/dbx.c:1.21 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx.c Mon Aug 13 12:39:55 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx.c,v 1.21 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx.c,v 1.22 2001/08/13 16:39:55 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -76,9 +76,9 @@ int split_dbx_handle_object(zval ** dbx_object, zval *** pdbx_handle, zval *** pdbx_module, zval *** pdbx_database) { convert_to_object_ex(dbx_object); - if (zend_hash_find((*dbx_object)->value.obj.properties, "handle", 7, (void **) pdbx_handle)==FAILURE - || zend_hash_find((*dbx_object)->value.obj.properties, "module", 7, (void **) pdbx_module)==FAILURE - || zend_hash_find((*dbx_object)->value.obj.properties, "database", 9, (void **) pdbx_database)==FAILURE) { + if (zend_hash_find(Z_OBJPROP_PP(dbx_object), "handle", 7, (void **) pdbx_handle)==FAILURE + || zend_hash_find(Z_OBJPROP_PP(dbx_object), "module", 7, (void **) pdbx_module)==FAILURE + || zend_hash_find(Z_OBJPROP_PP(dbx_object), "database", 9, (void **) pdbx_database)==FAILURE) { return 0; } return 1; @@ -284,9 +284,9 @@ RETURN_LONG(0); } - zend_hash_update(return_value->value.obj.properties, "handle", 7, (void *)&(rv_dbx_handle), sizeof(zval *), NULL); - zend_hash_update(return_value->value.obj.properties, "module", 7, (void *)&(dbx_module), sizeof(zval *), NULL); - zend_hash_update(return_value->value.obj.properties, "database", 9, (void *)&(db_name), sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(return_value), "handle", 7, (void *)&(rv_dbx_handle), sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(return_value), "module", 7, (void *)&(dbx_module), sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(return_value), "database", 9, (void *)&(db_name), sizeof(zval *), NULL); } /* }}} */ @@ -387,7 +387,7 @@ RETURN_LONG(0); } /* add result_handle property to return_value */ - zend_hash_update(return_value->value.obj.properties, "handle", 7, (void *)&(rv_result_handle), sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(return_value), "handle", 7, (void *)&(rv_result_handle), sizeof(zval *), NULL); /* init info property as array and add to return_value as a property */ if (info_flags & DBX_RESULT_INFO) { MAKE_STD_ZVAL(info); @@ -396,7 +396,7 @@ FREE_ZVAL(info); RETURN_LONG(0); } - zend_hash_update(return_value->value.obj.properties, "info", 5, (void *)&(info), sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(return_value), "info", 5, (void *)&(info), sizeof(zval *), NULL); } /* init data property as array and add to return_value as a property */ MAKE_STD_ZVAL(data); @@ -405,7 +405,7 @@ FREE_ZVAL(data); RETURN_LONG(0); } - zend_hash_update(return_value->value.obj.properties, "data", 5, (void *)&(data), sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(return_value), "data", 5, (void *)&(data), sizeof(zval *), NULL); /* get columncount and add to returnvalue as property */ MAKE_STD_ZVAL(rv_column_count); ZVAL_LONG(rv_column_count, 0); @@ -415,7 +415,7 @@ FREE_ZVAL(rv_column_count); RETURN_LONG(0); } - zend_hash_update(return_value->value.obj.properties, "cols", 5, (void *)&(rv_column_count), sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(return_value), "cols", 5, (void *)&(rv_column_count), sizeof(zval *), NULL); /* fill the info array with columnnames and types (indexed and assoc) */ if (info_flags & DBX_RESULT_INFO) { zval * info_row_name; @@ -645,7 +645,7 @@ RETURN_LONG(0); } - if (zend_hash_find((*arguments[0])->value.obj.properties, "data", 5, (void **) &zval_data)==FAILURE + if (zend_hash_find(Z_OBJPROP_PP(arguments[0]), "data", 5, (void **) &zval_data)==FAILURE || (*zval_data)->type != IS_ARRAY) { zend_error(E_WARNING, "Wrong argument type for sort"); RETURN_LONG(0); @@ -653,9 +653,8 @@ arguments[0] = zval_data; dbx_call_any_function(INTERNAL_FUNCTION_PARAM_PASSTHRU, "usort", &returned_zval, number_of_arguments, arguments); - zval_dtor(returned_zval); - FREE_ZVAL(returned_zval); - + zval_ptr_dtor(&returned_zval); + RETURN_LONG(1); } Index: php4/ext/dotnet/dotnet.cpp diff -u php4/ext/dotnet/dotnet.cpp:1.15 php4/ext/dotnet/dotnet.cpp:1.16 --- php4/ext/dotnet/dotnet.cpp:1.15 Sat Aug 11 12:38:25 2001 +++ php4/ext/dotnet/dotnet.cpp Mon Aug 13 12:39:59 2001 @@ -177,7 +177,7 @@ *object_handle = *return_value; pval_copy_constructor(object_handle); INIT_PZVAL(object_handle); - zend_hash_index_update(object->value.obj.properties, 0, &object_handle, sizeof(pval *), NULL); + zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL); pval_destructor(&function_name->element); } else { php_COM_call_function_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, property_reference); Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.44 php4/ext/fbsql/php_fbsql.c:1.45 --- php4/ext/fbsql/php_fbsql.c:1.44 Sat Aug 11 12:38:26 2001 +++ php4/ext/fbsql/php_fbsql.c Mon Aug 13 12:39:59 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.44 2001/08/11 16:38:26 zeev Exp $ */ +/* $Id: php_fbsql.c,v 1.45 2001/08/13 16:39:59 andi Exp $ */ /* TODO: * @@ -2382,11 +2382,8 @@ PHP_FUNCTION(fbsql_fetch_object) { php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC); - if (return_value->type==IS_ARRAY) - { - return_value->type=IS_OBJECT; - return_value->value.obj.properties = return_value->value.ht; - return_value->value.obj.ce = &zend_standard_class_def; + if (return_value->type==IS_ARRAY) { + object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht); } } /* }}} */ Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.13 php4/ext/ming/ming.c:1.14 --- php4/ext/ming/ming.c:1.13 Tue Aug 7 19:26:59 2001 +++ php4/ext/ming/ming.c Mon Aug 13 12:40:02 2001 @@ -117,7 +117,7 @@ if(id) { - if(zend_hash_find(id->value.obj.properties, name, namelen+1, (void **)&tmp) == FAILURE) + if(zend_hash_find(Z_OBJPROP_P(id), name, namelen+1, (void **)&tmp) == FAILURE) { php_error(E_WARNING, "unable to find property %s", name); return NULL; Index: php4/ext/qtdom/qtdom.c diff -u php4/ext/qtdom/qtdom.c:1.9 php4/ext/qtdom/qtdom.c:1.10 --- php4/ext/qtdom/qtdom.c:1.9 Tue Aug 7 19:26:59 2001 +++ php4/ext/qtdom/qtdom.c Mon Aug 13 12:40:03 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: qtdom.c,v 1.9 2001/08/07 23:26:59 sniper Exp $ */ +/* $Id: qtdom.c,v 1.10 2001/08/13 16:40:03 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -176,10 +176,8 @@ struct qdom_attribute *attr = qdom_do_node_attributes( node ); if ( qdom_find_attributes( &a_children, attr TSRMLS_CC) > 0 ) { - zend_hash_update(child->value.obj.properties, - "attributes", sizeof("attributes"), - (void *) &a_children, sizeof(zval *), - NULL); + zend_hash_update(Z_OBJPROP_P(child), "attributes", sizeof("attributes"), + (void *) &a_children, sizeof(zval *), NULL); } qdom_do_attributes_free( attr ); /* add_property_long(child, "attributes", num_attrs ); */ Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.60 php4/ext/sybase_ct/php_sybase_ct.c:1.61 --- php4/ext/sybase_ct/php_sybase_ct.c:1.60 Sun Aug 5 23:50:52 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Mon Aug 13 12:40:04 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.60 2001/08/06 03:50:52 sas Exp $ */ +/* $Id: php_sybase_ct.c,v 1.61 2001/08/13 16:40:04 andi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1384,9 +1384,7 @@ { php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); if (return_value->type==IS_ARRAY) { - return_value->type=IS_OBJECT; - return_value->value.obj.properties = return_value->value.ht; - return_value->value.obj.ce = &zend_standard_class_def; + object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht); } } /* }}} */