- More ZE2 fixes

Andi Gutmans · Andi Gutmans · commit 9a3d4e736c97 · 2001-08-13T16:13:25.000Z
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -244,7 +244,7 @@ static int add_assoc_object(zval *arg, char *key, zval *tmp)
 	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 @@ static inline int add_next_index_object(zval *arg, zval *tmp)
 	HashTable *symtable;
 	
 	if (arg->type == IS_OBJECT) {
-		symtable = arg->value.obj.properties;
+		symtable = Z_OBJPROP_P(arg);
 	} else {
 		symtable = arg->value.ht;
 	}
diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
@@ -203,7 +203,7 @@ static int add_assoc_object(zval *arg, char *key, zval *tmp)
 	HashTable *symtable;
 	
 	if (arg->type == IS_OBJECT) {
-		symtable = arg->value.obj.properties;
+		symtable = Z_OBJPROP_P(arg);
 	} else {
 		symtable = arg->value.ht;
 	}
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
@@ -982,9 +982,7 @@ PHP_FUNCTION(msql_fetch_object)
 {
 	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);
 	}
 }
 /* }}} */
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
@@ -1226,9 +1226,7 @@ PHP_FUNCTION(mssql_fetch_object)
 {
 	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);
 	}
 }
 
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -1337,7 +1337,6 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
    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);
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -1252,9 +1252,7 @@ PHP_FUNCTION(pg_fetch_object)
 {
 	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);
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ static int add_assoc_object(zval arg, char key, zval *tmp)`
`203`	`203`	`HashTable *symtable;`
`204`	`204`
`205`	`205`	`if (arg->type == IS_OBJECT) {`
`206`		`- symtable = arg->value.obj.properties;`
	`206`	`+ symtable = Z_OBJPROP_P(arg);`
`207`	`207`	`} else {`
`208`	`208`	`symtable = arg->value.ht;`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -982,9 +982,7 @@ PHP_FUNCTION(msql_fetch_object)`
`982`	`982`	`{`
`983`	`983`	`php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
`984`	`984`	`if (return_value->type==IS_ARRAY) {`
`985`		`- return_value->type=IS_OBJECT;`
`986`		`- return_value->value.obj.properties = return_value->value.ht;`
`987`		`- return_value->value.obj.ce = &zend_standard_class_def;`
	`985`	`+ object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht);`
`988`	`986`	`}`
`989`	`987`	`}`
`990`	`988`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -1226,9 +1226,7 @@ PHP_FUNCTION(mssql_fetch_object)`
`1226`	`1226`	`{`
`1227`	`1227`	`php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);`
`1228`	`1228`	`if (return_value->type==IS_ARRAY) {`
`1229`		`- return_value->type=IS_OBJECT;`
`1230`		`- return_value->value.obj.properties = return_value->value.ht;`
`1231`		`- return_value->value.obj.ce = &zend_standard_class_def;`
	`1229`	`+ object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht);`
`1232`	`1230`	`}`
`1233`	`1231`	`}`
`1234`	`1232`
Original file line number	Diff line number	Diff line change
`@@ -1337,7 +1337,6 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)`
`1337`	`1337`	`Fetch a result row as an object */`
`1338`	`1338`	`PHP_FUNCTION(odbc_fetch_object)`
`1339`	`1339`	`{`
`1340`		`- /* OBJECTS_FIXME */`
`1341`	`1340`	`php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT);`
`1342`	`1341`	`if (Z_TYPE_P(return_value) == IS_ARRAY) {`
`1343`	`1342`	`object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht);`
Original file line number	Diff line number	Diff line change
`@@ -1252,9 +1252,7 @@ PHP_FUNCTION(pg_fetch_object)`
`1252`	`1252`	`{`
`1253`	`1253`	`php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
`1254`	`1254`	`if (return_value->type==IS_ARRAY) {`
`1255`		`- return_value->type=IS_OBJECT;`
`1256`		`- return_value->value.obj.properties = return_value->value.ht;`
`1257`		`- return_value->value.obj.ce = &zend_standard_class_def;`
	`1255`	`+ object_and_properties_init(return_value, &zend_standard_class_def, return_value->value.ht);`
`1258`	`1256`	`}`
`1259`	`1257`	`}`
`1260`	`1258`	`/* }}} */`