cvs: php4 /ext/imap php_imap.c /ext/mcal php_mcal.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/odbc php_odbc.c /ext/pgsql pgsql.c

andi Mon Aug 13 12:13:21 2001 EDT Modified files: /php4/ext/imap php_imap.c /php4/ext/mcal php_mcal.c /php4/ext/msql php_msql.c /php4/ext/mssql php_mssql.c /php4/ext/odbc php_odbc.c /php4/ext/pgsql pgsql.c Log: - More ZE2 fixes Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.99 php4/ext/imap/php_imap.c:1.100 --- php4/ext/imap/php_imap.c:1.99 Sat Aug 11 12:38:51 2001 +++ php4/ext/imap/php_imap.c Mon Aug 13 12:13:16 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.99 2001/08/11 16:38:51 zeev Exp $ */ +/* $Id: php_imap.c,v 1.100 2001/08/13 16:13:16 andi Exp $ */ #define IMAP41 @@ -244,7 +244,7 @@ HashTable *symtable; if (arg->type == IS_OBJECT) { - symtable = arg->value.obj.properties; + symtable = Z_OBJPROP_P(arg); } else { symtable = arg->value.ht; } @@ -259,7 +259,7 @@ HashTable *symtable; if (arg->type == IS_OBJECT) { - symtable = arg->value.obj.properties; + symtable = Z_OBJPROP_P(arg); } else { symtable = arg->value.ht; } Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.45 php4/ext/mcal/php_mcal.c:1.46 --- php4/ext/mcal/php_mcal.c:1.45 Tue Aug 7 16:13:52 2001 +++ php4/ext/mcal/php_mcal.c Mon Aug 13 12:13:16 2001 @@ -203,7 +203,7 @@ HashTable *symtable; if (arg->type == IS_OBJECT) { - symtable = arg->value.obj.properties; + symtable = Z_OBJPROP_P(arg); } else { symtable = arg->value.ht; } Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.39 php4/ext/msql/php_msql.c:1.40 --- php4/ext/msql/php_msql.c:1.39 Sun Aug 5 23:50:47 2001 +++ php4/ext/msql/php_msql.c Mon Aug 13 12:13:17 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.39 2001/08/06 03:50:47 sas Exp $ */ +/* $Id: php_msql.c,v 1.40 2001/08/13 16:13:17 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -982,9 +982,7 @@ { php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); 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); } } /* }}} */ Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.66 php4/ext/mssql/php_mssql.c:1.67 --- php4/ext/mssql/php_mssql.c:1.66 Sun Aug 5 23:50:47 2001 +++ php4/ext/mssql/php_mssql.c Mon Aug 13 12:13:17 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.66 2001/08/06 03:50:47 sas Exp $ */ +/* $Id: php_mssql.c,v 1.67 2001/08/13 16:13:17 andi Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -1226,9 +1226,7 @@ { php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_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; + object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht); } } Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.106 php4/ext/odbc/php_odbc.c:1.107 --- php4/ext/odbc/php_odbc.c:1.106 Mon Aug 13 03:55:34 2001 +++ php4/ext/odbc/php_odbc.c Mon Aug 13 12:13:18 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.106 2001/08/13 07:55:34 rasmus Exp $ */ +/* $Id: php_odbc.c,v 1.107 2001/08/13 16:13:18 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1337,7 +1337,6 @@ Fetch a result row as an object */ PHP_FUNCTION(odbc_fetch_object) { - /* OBJECTS_FIXME */ php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); if (Z_TYPE_P(return_value) == IS_ARRAY) { object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht); Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.125 php4/ext/pgsql/pgsql.c:1.126 --- php4/ext/pgsql/pgsql.c:1.125 Sun Aug 5 23:50:50 2001 +++ php4/ext/pgsql/pgsql.c Mon Aug 13 12:13:19 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.125 2001/08/06 03:50:50 sas Exp $ */ +/* $Id: pgsql.c,v 1.126 2001/08/13 16:13:19 andi Exp $ */ #include <stdlib.h> @@ -1252,9 +1252,7 @@ { php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); 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); } } /* }}} */