clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Allow duality between Engine 1 & 2 using ZEND_STANDARD_CLASS_DEF_PTR

Browse Source
This commit is contained in:
Andi Gutmans 2002-03-12 20:18:01 +00:00
parent 0ee65254ee
commit c8e7db984c
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/fbsql/php_fbsql.c
View File

@ -2687,7 +2687,7 @@ PHP_FUNCTION(fbsql_fetch_object)
{ {
php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC); php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC);
if (Z_TYPE_P(return_value)==IS_ARRAY) { 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));
} }
} }
/* }}} */ /* }}} */

2
ext/msql/php_msql.c
View File

@ -982,7 +982,7 @@ PHP_FUNCTION(msql_fetch_object)
{ {
php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
if (Z_TYPE_P(return_value)==IS_ARRAY) { 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));
} }
} }
/* }}} */ /* }}} */

2
ext/mssql/php_mssql.c
View File

@ -1271,7 +1271,7 @@ PHP_FUNCTION(mssql_fetch_object)
{ {
php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC); php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);
if (Z_TYPE_P(return_value)==IS_ARRAY) { 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));
} }
} }

2
ext/mysql/php_mysql.c
View File

@ -1661,7 +1661,7 @@ PHP_FUNCTION(mysql_fetch_object)
php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2); php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2);
if (Z_TYPE_P(return_value) == IS_ARRAY) { 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));
} }
} }
/* }}} */ /* }}} */

2
ext/odbc/php_odbc.c
View File

@ -1365,7 +1365,7 @@ PHP_FUNCTION(odbc_fetch_object)
{ {
php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT); php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT);
if (Z_TYPE_P(return_value) == IS_ARRAY) { 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));
} }
} }
/* }}} */ /* }}} */

2
ext/pgsql/pgsql.c
View File

@ -1288,7 +1288,7 @@ PHP_FUNCTION(pg_fetch_object)
{ {
php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
if (Z_TYPE_P(return_value)==IS_ARRAY) { 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));
} }
} }
/* }}} */ /* }}} */

2
ext/standard/browscap.c
View File

@ -116,7 +116,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, vo
INIT_PZVAL(processed); INIT_PZVAL(processed);
/* OBJECTS_FIXME */ /* 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_OBJPROP_P(current_section) = (HashTable *) malloc(sizeof(HashTable));
Z_TYPE_P(current_section) = IS_OBJECT; Z_TYPE_P(current_section) = IS_OBJECT;
zend_hash_init(Z_OBJPROP_P(current_section), 0, NULL, (dtor_func_t) browscap_entry_dtor, 1); zend_hash_init(Z_OBJPROP_P(current_section), 0, NULL, (dtor_func_t) browscap_entry_dtor, 1);

2
ext/standard/var_unserializer.c
View File

@ -458,7 +458,7 @@ yy27:
INIT_PZVAL(*rval); INIT_PZVAL(*rval);
return object_common2(UNSERIALIZE_PASSTHRU, 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; yy28: yych = *++YYCURSOR;
if(yych <= ','){ if(yych <= ','){

2
ext/standard/var_unserializer.re
View File

@ -323,7 +323,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
INIT_PZVAL(*rval); INIT_PZVAL(*rval);
return object_common2(UNSERIALIZE_PASSTHRU, return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def)); object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
} }
"O:" iv ":" ["] { "O:" iv ":" ["] {

2
ext/sybase/php_sybase_db.c
View File

@ -1074,7 +1074,7 @@ PHP_FUNCTION(sybase_fetch_object)
if (Z_TYPE_P(return_value)==IS_ARRAY) { if (Z_TYPE_P(return_value)==IS_ARRAY) {
Z_TYPE_P(return_value)=IS_OBJECT; Z_TYPE_P(return_value)=IS_OBJECT;
Z_OBJPROP_P(return_value) = Z_ARRVAL_P(return_value); 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;
} }
} }
/* }}} */ /* }}} */

2
ext/sybase_ct/php_sybase_ct.c
View File

@ -1411,7 +1411,7 @@ PHP_FUNCTION(sybase_fetch_object)
{ {
php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU); php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
if (Z_TYPE_P(return_value)==IS_ARRAY) { 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));
} }
} }
/* }}} */ /* }}} */