@@ -4063,7 +4063,7 @@ PHP_METHOD(DateTimeZone, __construct)
40634063}
40644064/* }}} */
40654065
4066- static bool php_date_timezone_initialize_from_hash (zval * * return_value , php_timezone_obj * * tzobj , const HashTable * myht ) /* {{{ */
4066+ static bool php_date_timezone_initialize_from_hash (php_timezone_obj * * tzobj , const HashTable * myht ) /* {{{ */
40674067{
40684068 zval * z_timezone_type ;
40694069
@@ -4104,7 +4104,7 @@ PHP_METHOD(DateTimeZone, __set_state)
41044104
41054105 php_date_instantiate (date_ce_timezone , return_value );
41064106 tzobj = Z_PHPTIMEZONE_P (return_value );
4107- if (!php_date_timezone_initialize_from_hash (& return_value , & tzobj , myht )) {
4107+ if (!php_date_timezone_initialize_from_hash (& tzobj , myht )) {
41084108 zend_throw_error (NULL , "Invalid serialization data for DateTimeZone object" );
41094109 RETURN_THROWS ();
41104110 }
@@ -4124,7 +4124,7 @@ PHP_METHOD(DateTimeZone, __wakeup)
41244124
41254125 myht = Z_OBJPROP_P (object );
41264126
4127- if (!php_date_timezone_initialize_from_hash (& return_value , & tzobj , myht )) {
4127+ if (!php_date_timezone_initialize_from_hash (& tzobj , myht )) {
41284128 zend_throw_error (NULL , "Invalid serialization data for DateTimeZone object" );
41294129 RETURN_THROWS ();
41304130 }
@@ -4188,7 +4188,7 @@ PHP_METHOD(DateTimeZone, __unserialize)
41884188
41894189 tzobj = Z_PHPTIMEZONE_P (object );
41904190
4191- if (!php_date_timezone_initialize_from_hash (& object , & tzobj , myht )) {
4191+ if (!php_date_timezone_initialize_from_hash (& tzobj , myht )) {
41924192 zend_throw_error (NULL , "Invalid serialization data for DateTimeZone object" );
41934193 RETURN_THROWS ();
41944194 }
@@ -4613,7 +4613,7 @@ PHP_METHOD(DateInterval, __construct)
46134613}
46144614/* }}} */
46154615
4616- static void php_date_interval_initialize_from_hash (zval * * return_value , php_interval_obj * * intobj , const HashTable * myht ) /* {{{ */
4616+ static void php_date_interval_initialize_from_hash (php_interval_obj * * intobj , const HashTable * myht ) /* {{{ */
46174617{
46184618 /* If we have a date_string, use that instead */
46194619 const zval * date_str = zend_hash_str_find (myht , "date_string" , strlen ("date_string" ));
@@ -4752,7 +4752,7 @@ PHP_METHOD(DateInterval, __set_state)
47524752
47534753 php_date_instantiate (date_ce_interval , return_value );
47544754 intobj = Z_PHPINTERVAL_P (return_value );
4755- php_date_interval_initialize_from_hash (& return_value , & intobj , myht );
4755+ php_date_interval_initialize_from_hash (& intobj , myht );
47564756}
47574757/* }}} */
47584758
@@ -4823,7 +4823,7 @@ PHP_METHOD(DateInterval, __unserialize)
48234823
48244824 intervalobj = Z_PHPINTERVAL_P (object );
48254825
4826- php_date_interval_initialize_from_hash (& object , & intervalobj , myht );
4826+ php_date_interval_initialize_from_hash (& intervalobj , myht );
48274827 restore_custom_dateinterval_properties (object , myht );
48284828}
48294829/* }}} */
@@ -4841,7 +4841,7 @@ PHP_METHOD(DateInterval, __wakeup)
48414841
48424842 myht = Z_OBJPROP_P (object );
48434843
4844- php_date_interval_initialize_from_hash (& return_value , & intobj , myht );
4844+ php_date_interval_initialize_from_hash (& intobj , myht );
48454845}
48464846/* }}} */
48474847
0 commit comments