- Allow duality between Engine 1 & 2 using ZEND_STANDARD_CLASS_DEF_PTR

Andi Gutmans · Andi Gutmans · commit c8e7db984c8b · 2002-03-12T20:18:01.000Z
diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
@@ -2687,7 +2687,7 @@ PHP_FUNCTION(fbsql_fetch_object)
 {
 	php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
@@ -982,7 +982,7 @@ PHP_FUNCTION(msql_fetch_object)
 {
 	php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
@@ -1271,7 +1271,7 @@ PHP_FUNCTION(mssql_fetch_object)
 {
 	php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
@@ -1661,7 +1661,7 @@ PHP_FUNCTION(mysql_fetch_object)
 	php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2);
 
 	if (Z_TYPE_P(return_value) == IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -1365,7 +1365,7 @@ PHP_FUNCTION(odbc_fetch_object)
 {
 	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, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -1288,7 +1288,7 @@ PHP_FUNCTION(pg_fetch_object)
 {
 	php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
@@ -116,7 +116,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, vo
 				INIT_PZVAL(processed);
 
 				/* OBJECTS_FIXME */
-				Z_OBJCE_P(current_section) = &zend_standard_class_def;
+				Z_OBJCE_P(current_section) = ZEND_STANDARD_CLASS_DEF_PTR;
 				Z_OBJPROP_P(current_section) = (HashTable *) malloc(sizeof(HashTable));
 				Z_TYPE_P(current_section) = IS_OBJECT;
 				zend_hash_init(Z_OBJPROP_P(current_section), 0, NULL, (dtor_func_t) browscap_entry_dtor, 1);
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
@@ -458,7 +458,7 @@ yy26:	yych = *++YYCURSOR;
 	INIT_PZVAL(*rval);
 	
 	return object_common2(UNSERIALIZE_PASSTHRU,
-			object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def));
+			object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
 yy28:	yych = *++YYCURSOR;
 	if(yych <= ','){
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
@@ -323,7 +323,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 	INIT_PZVAL(*rval);
 	
 	return object_common2(UNSERIALIZE_PASSTHRU,
-			object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def));
+			object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
 
 "O:" iv ":" ["]	{
diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
@@ -1074,7 +1074,7 @@ PHP_FUNCTION(sybase_fetch_object)
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
 		Z_TYPE_P(return_value)=IS_OBJECT;
 		Z_OBJPROP_P(return_value) = Z_ARRVAL_P(return_value);
-		Z_OBJCE_P(return_value) = &zend_standard_class_def;
+		Z_OBJCE_P(return_value) = ZEND_STANDARD_CLASS_DEF_PTR;
 	}
 }
 /* }}} */
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
@@ -1411,7 +1411,7 @@ PHP_FUNCTION(sybase_fetch_object)
 {
 	php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -2687,7 +2687,7 @@ PHP_FUNCTION(fbsql_fetch_object)`
`2687`	`2687`	`{`
`2688`	`2688`	`php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC);`
`2689`	`2689`	`if (Z_TYPE_P(return_value)==IS_ARRAY) {`
`2690`		`- object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));`
	`2690`	`+ object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));`
`2691`	`2691`	`}`
`2692`	`2692`	`}`
`2693`	`2693`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,7 @@ PHP_FUNCTION(msql_fetch_object)`
`982`	`982`	`{`
`983`	`983`	`php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
`984`	`984`	`if (Z_TYPE_P(return_value)==IS_ARRAY) {`
`985`		`- object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));`
	`985`	`+ object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));`
`986`	`986`	`}`
`987`	`987`	`}`
`988`	`988`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -1271,7 +1271,7 @@ PHP_FUNCTION(mssql_fetch_object)`
`1271`	`1271`	`{`
`1272`	`1272`	`php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);`
`1273`	`1273`	`if (Z_TYPE_P(return_value)==IS_ARRAY) {`
`1274`		`- object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));`
	`1274`	`+ object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));`
`1275`	`1275`	`}`
`1276`	`1276`	`}`
`1277`	`1277`
Original file line number	Diff line number	Diff line change
`@@ -1661,7 +1661,7 @@ PHP_FUNCTION(mysql_fetch_object)`
`1661`	`1661`	`php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2);`
`1662`	`1662`
`1663`	`1663`	`if (Z_TYPE_P(return_value) == IS_ARRAY) {`
`1664`		`- object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));`
	`1664`	`+ object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));`
`1665`	`1665`	`}`
`1666`	`1666`	`}`
`1667`	`1667`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -1365,7 +1365,7 @@ PHP_FUNCTION(odbc_fetch_object)`
`1365`	`1365`	`{`
`1366`	`1366`	`php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT);`
`1367`	`1367`	`if (Z_TYPE_P(return_value) == IS_ARRAY) {`
`1368`		`- object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));`
	`1368`	`+ object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));`
`1369`	`1369`	`}`
`1370`	`1370`	`}`
`1371`	`1371`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,7 @@ PHP_FUNCTION(pg_fetch_object)`
`1288`	`1288`	`{`
`1289`	`1289`	`php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);`
`1290`	`1290`	`if (Z_TYPE_P(return_value)==IS_ARRAY) {`
`1291`		`- object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));`
	`1291`	`+ object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));`
`1292`	`1292`	`}`
`1293`	`1293`	`}`
`1294`	`1294`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ yy26: yych = *++YYCURSOR;`
`458`	`458`	`INIT_PZVAL(*rval);`
`459`	`459`
`460`	`460`	`return object_common2(UNSERIALIZE_PASSTHRU,`
`461`		`- object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def));`
	`461`	`+ object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));`
`462`	`462`	`}`
`463`	`463`	`yy28: yych = *++YYCURSOR;`
`464`	`464`	`if(yych <= ','){`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)`
`323`	`323`	`INIT_PZVAL(*rval);`
`324`	`324`
`325`	`325`	`return object_common2(UNSERIALIZE_PASSTHRU,`
`326`		`- object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def));`
	`326`	`+ object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`"O:" iv ":" ["] {`
Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,7 @@ PHP_FUNCTION(sybase_fetch_object)`
`1074`	`1074`	`if (Z_TYPE_P(return_value)==IS_ARRAY) {`
`1075`	`1075`	`Z_TYPE_P(return_value)=IS_OBJECT;`
`1076`	`1076`	`Z_OBJPROP_P(return_value) = Z_ARRVAL_P(return_value);`
`1077`		`- Z_OBJCE_P(return_value) = &zend_standard_class_def;`
	`1077`	`+ Z_OBJCE_P(return_value) = ZEND_STANDARD_CLASS_DEF_PTR;`
`1078`	`1078`	`}`
`1079`	`1079`	`}`
`1080`	`1080`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -1411,7 +1411,7 @@ PHP_FUNCTION(sybase_fetch_object)`
`1411`	`1411`	`{`
`1412`	`1412`	`php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);`
`1413`	`1413`	`if (Z_TYPE_P(return_value)==IS_ARRAY) {`
`1414`		`- object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));`
	`1414`	`+ object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));`
`1415`	`1415`	`}`
`1416`	`1416`	`}`
`1417`	`1417`	`/* }}} */`