@@ -423,7 +423,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
423
423
}
424
424
}
425
425
break ;
426
-
426
+
427
427
case 'p' :
428
428
{
429
429
char * * p = va_arg (* va , char * * );
@@ -1006,9 +1006,9 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type) /* {{{ *
1006
1006
zend_update_class_constants (class_type -> parent );
1007
1007
}
1008
1008
#if ZTS
1009
- CG (static_members_table )[(zend_intptr_t )(class_type -> static_members_table )] = emalloc (sizeof (zval * ) * class_type -> default_static_members_count );
1009
+ CG (static_members_table )[(zend_intptr_t )(class_type -> static_members_table )] = emalloc (sizeof (zval ) * class_type -> default_static_members_count );
1010
1010
#else
1011
- class_type -> static_members_table = emalloc (sizeof (zval * ) * class_type -> default_static_members_count );
1011
+ class_type -> static_members_table = emalloc (sizeof (zval ) * class_type -> default_static_members_count );
1012
1012
#endif
1013
1013
for (i = 0 ; i < class_type -> default_static_members_count ; i ++ ) {
1014
1014
p = & class_type -> default_static_members_table [i ];
@@ -1121,7 +1121,7 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties)
1121
1121
prop = zend_hash_update (object -> properties , key , prop );
1122
1122
zval_add_ref (prop );
1123
1123
}
1124
- } ZEND_HASH_FOREACH_END ();
1124
+ } ZEND_HASH_FOREACH_END ();
1125
1125
}
1126
1126
/* }}} */
1127
1127
@@ -1176,7 +1176,7 @@ ZEND_API int add_assoc_function(zval *arg, const char *key, void (*function_ptr)
1176
1176
ZEND_API int add_assoc_long_ex (zval * arg , const char * key , size_t key_len , zend_long n ) /* {{{ */
1177
1177
{
1178
1178
zval * ret , tmp ;
1179
-
1179
+
1180
1180
ZVAL_LONG (& tmp , n );
1181
1181
ret = zend_symtable_str_update (Z_ARRVAL_P (arg ), key , key_len , & tmp );
1182
1182
return ret ? SUCCESS : FAILURE ;
@@ -1186,7 +1186,7 @@ ZEND_API int add_assoc_long_ex(zval *arg, const char *key, size_t key_len, zend_
1186
1186
ZEND_API int add_assoc_null_ex (zval * arg , const char * key , size_t key_len ) /* {{{ */
1187
1187
{
1188
1188
zval * ret , tmp ;
1189
-
1189
+
1190
1190
ZVAL_NULL (& tmp );
1191
1191
ret = zend_symtable_str_update (Z_ARRVAL_P (arg ), key , key_len , & tmp );
1192
1192
return ret ? SUCCESS : FAILURE ;
@@ -1196,7 +1196,7 @@ ZEND_API int add_assoc_null_ex(zval *arg, const char *key, size_t key_len) /* {{
1196
1196
ZEND_API int add_assoc_bool_ex (zval * arg , const char * key , size_t key_len , int b ) /* {{{ */
1197
1197
{
1198
1198
zval * ret , tmp ;
1199
-
1199
+
1200
1200
ZVAL_BOOL (& tmp , b );
1201
1201
ret = zend_symtable_str_update (Z_ARRVAL_P (arg ), key , key_len , & tmp );
1202
1202
return ret ? SUCCESS : FAILURE ;
@@ -1206,7 +1206,7 @@ ZEND_API int add_assoc_bool_ex(zval *arg, const char *key, size_t key_len, int b
1206
1206
ZEND_API int add_assoc_resource_ex (zval * arg , const char * key , size_t key_len , zend_resource * r ) /* {{{ */
1207
1207
{
1208
1208
zval * ret , tmp ;
1209
-
1209
+
1210
1210
ZVAL_RES (& tmp , r );
1211
1211
ret = zend_symtable_str_update (Z_ARRVAL_P (arg ), key , key_len , & tmp );
1212
1212
return ret ? SUCCESS : FAILURE ;
@@ -1216,7 +1216,7 @@ ZEND_API int add_assoc_resource_ex(zval *arg, const char *key, size_t key_len, z
1216
1216
ZEND_API int add_assoc_double_ex (zval * arg , const char * key , size_t key_len , double d ) /* {{{ */
1217
1217
{
1218
1218
zval * ret , tmp ;
1219
-
1219
+
1220
1220
ZVAL_DOUBLE (& tmp , d );
1221
1221
ret = zend_symtable_str_update (Z_ARRVAL_P (arg ), key , key_len , & tmp );
1222
1222
return ret ? SUCCESS : FAILURE ;
@@ -1236,7 +1236,7 @@ ZEND_API int add_assoc_str_ex(zval *arg, const char *key, size_t key_len, zend_s
1236
1236
ZEND_API int add_assoc_string_ex (zval * arg , const char * key , size_t key_len , char * str ) /* {{{ */
1237
1237
{
1238
1238
zval * ret , tmp ;
1239
-
1239
+
1240
1240
ZVAL_STRING (& tmp , str );
1241
1241
ret = zend_symtable_str_update (Z_ARRVAL_P (arg ), key , key_len , & tmp );
1242
1242
return ret ? SUCCESS : FAILURE ;
@@ -1246,7 +1246,7 @@ ZEND_API int add_assoc_string_ex(zval *arg, const char *key, size_t key_len, cha
1246
1246
ZEND_API int add_assoc_stringl_ex (zval * arg , const char * key , size_t key_len , char * str , size_t length ) /* {{{ */
1247
1247
{
1248
1248
zval * ret , tmp ;
1249
-
1249
+
1250
1250
ZVAL_STRINGL (& tmp , str , length );
1251
1251
ret = zend_symtable_str_update (Z_ARRVAL_P (arg ), key , key_len , & tmp );
1252
1252
return ret ? SUCCESS : FAILURE ;
@@ -1256,7 +1256,7 @@ ZEND_API int add_assoc_stringl_ex(zval *arg, const char *key, size_t key_len, ch
1256
1256
ZEND_API int add_assoc_zval_ex (zval * arg , const char * key , size_t key_len , zval * value ) /* {{{ */
1257
1257
{
1258
1258
zval * ret ;
1259
-
1259
+
1260
1260
ret = zend_symtable_str_update (Z_ARRVAL_P (arg ), key , key_len , value );
1261
1261
return ret ? SUCCESS : FAILURE ;
1262
1262
}
@@ -1782,7 +1782,7 @@ ZEND_API void zend_collect_module_handlers(void) /* {{{ */
1782
1782
module_post_deactivate_handlers = module_request_shutdown_handlers + shutdown_count + 1 ;
1783
1783
module_post_deactivate_handlers [post_deactivate_count ] = NULL ;
1784
1784
startup_count = 0 ;
1785
-
1785
+
1786
1786
ZEND_HASH_FOREACH_PTR (& module_registry , module ) {
1787
1787
if (module -> request_startup_func ) {
1788
1788
module_request_startup_handlers [startup_count ++ ] = module ;
@@ -2025,7 +2025,7 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
2025
2025
}
2026
2026
if (ptr -> arg_info ) {
2027
2027
zend_internal_function_info * info = (zend_internal_function_info * )ptr -> arg_info ;
2028
-
2028
+
2029
2029
internal_function -> arg_info = (zend_internal_arg_info * )ptr -> arg_info + 1 ;
2030
2030
internal_function -> num_args = ptr -> num_args ;
2031
2031
/* Currently you cannot denote that the function can accept less arguments than num_args */
@@ -2651,7 +2651,7 @@ static int zend_is_callable_check_class(zend_string *name, zend_fcall_info_cache
2651
2651
zend_string * lcname ;
2652
2652
ALLOCA_FLAG (use_heap );
2653
2653
2654
- STR_ALLOCA_ALLOC (lcname , name_len , use_heap );
2654
+ STR_ALLOCA_ALLOC (lcname , name_len , use_heap );
2655
2655
zend_str_tolower_copy (lcname -> val , name -> val , name_len );
2656
2656
2657
2657
* strict_class = 0 ;
@@ -3015,7 +3015,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint
3015
3015
if (error ) {
3016
3016
* error = NULL ;
3017
3017
}
3018
-
3018
+
3019
3019
fcc -> initialized = 0 ;
3020
3020
fcc -> calling_scope = NULL ;
3021
3021
fcc -> called_scope = NULL ;
@@ -3093,7 +3093,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint
3093
3093
if (callable_name ) {
3094
3094
char * ptr ;
3095
3095
3096
-
3096
+
3097
3097
* callable_name = zend_string_alloc (Z_STRLEN_P (obj ) + Z_STRLEN_P (method ) + sizeof ("::" ) - 1 , 0 );
3098
3098
ptr = (* callable_name )-> val ;
3099
3099
memcpy (ptr , Z_STRVAL_P (obj ), Z_STRLEN_P (obj ));
@@ -3182,7 +3182,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zend_object *object, uint
3182
3182
* callable_name = zend_string_alloc (ce -> name -> len + sizeof ("::__invoke" ) - 1 , 0 );
3183
3183
memcpy ((* callable_name )-> val , ce -> name -> val , ce -> name -> len );
3184
3184
memcpy ((* callable_name )-> val + ce -> name -> len , "::__invoke" , sizeof ("::__invoke" ));
3185
- }
3185
+ }
3186
3186
return 1 ;
3187
3187
}
3188
3188
/* break missing intentionally */
@@ -3749,7 +3749,7 @@ ZEND_API int zend_update_static_property(zend_class_entry *scope, const char *na
3749
3749
ZEND_API int zend_update_static_property_null (zend_class_entry * scope , const char * name , size_t name_length ) /* {{{ */
3750
3750
{
3751
3751
zval tmp ;
3752
-
3752
+
3753
3753
ZVAL_NULL (& tmp );
3754
3754
return zend_update_static_property (scope , name , name_length , & tmp );
3755
3755
}
@@ -3958,7 +3958,7 @@ ZEND_API void zend_ctor_make_null(zend_execute_data *execute_data) /* {{{ */
3958
3958
if (Z_TYPE_P(EX(return_value)) == IS_OBJECT) {
3959
3959
zend_object *object = Z_OBJ_P(EX(return_value));
3960
3960
zend_execute_data *ex = EX(prev_execute_data);
3961
-
3961
+
3962
3962
while (ex && Z_OBJ(ex->This) == object) {
3963
3963
if (ex->func) {
3964
3964
if (ZEND_USER_CODE(ex->func->type)) {
0 commit comments