diff options
Diffstat (limited to 'Zend/zend_builtin_functions.c')
-rw-r--r-- | Zend/zend_builtin_functions.c | 192 |
1 files changed, 96 insertions, 96 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index fcf2420ac6..c05e797013 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -321,9 +321,9 @@ ZEND_MINIT_FUNCTION(core) { /* {{{ */ zend_class_entry class_entry; INIT_CLASS_ENTRY(class_entry, "stdClass", NULL); - zend_standard_class_def = zend_register_internal_class(&class_entry TSRMLS_CC); + zend_standard_class_def = zend_register_internal_class(&class_entry); - zend_register_default_classes(TSRMLS_C); + zend_register_default_classes(); return SUCCESS; } @@ -343,11 +343,11 @@ zend_module_entry zend_builtin_module = { /* {{{ */ }; /* }}} */ -int zend_startup_builtin_functions(TSRMLS_D) /* {{{ */ +int zend_startup_builtin_functions(void) /* {{{ */ { zend_builtin_module.module_number = 0; zend_builtin_module.type = MODULE_PERSISTENT; - return (EG(current_module) = zend_register_module_ex(&zend_builtin_module TSRMLS_CC)) == NULL ? FAILURE : SUCCESS; + return (EG(current_module) = zend_register_module_ex(&zend_builtin_module)) == NULL ? FAILURE : SUCCESS; } /* }}} */ @@ -364,7 +364,7 @@ ZEND_FUNCTION(zend_version) Returns number of freed zvals */ ZEND_FUNCTION(gc_collect_cycles) { - RETURN_LONG(gc_collect_cycles(TSRMLS_C)); + RETURN_LONG(gc_collect_cycles()); } /* }}} */ @@ -420,7 +420,7 @@ ZEND_FUNCTION(func_get_arg) zend_long requested_offset; zend_execute_data *ex; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &requested_offset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &requested_offset) == FAILURE) { return; } @@ -526,7 +526,7 @@ ZEND_FUNCTION(strlen) zend_string *s; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &s) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &s) == FAILURE) { return; } #else @@ -545,7 +545,7 @@ ZEND_FUNCTION(strcmp) { zend_string *s1, *s2; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &s1, &s2) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &s1, &s2) == FAILURE) { return; } @@ -560,7 +560,7 @@ ZEND_FUNCTION(strncmp) zend_string *s1, *s2; zend_long len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSl", &s1, &s2, &len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSl", &s1, &s2, &len) == FAILURE) { return; } @@ -579,7 +579,7 @@ ZEND_FUNCTION(strcasecmp) { zend_string *s1, *s2; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &s1, &s2) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &s1, &s2) == FAILURE) { return; } @@ -594,7 +594,7 @@ ZEND_FUNCTION(strncasecmp) zend_string *s1, *s2; zend_long len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSl", &s1, &s2, &len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSl", &s1, &s2, &len) == FAILURE) { return; } @@ -616,7 +616,7 @@ ZEND_FUNCTION(each) HashTable *target_hash; zend_string *key; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "z/", &array) == FAILURE) { return; } @@ -673,7 +673,7 @@ ZEND_FUNCTION(error_reporting) zend_string *err; int old_error_reporting; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|S", &err) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|S", &err) == FAILURE) { return; } @@ -699,7 +699,7 @@ ZEND_FUNCTION(define) zend_constant c; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz|b", &name, &val, &non_cs) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Sz|b", &name, &val, &non_cs) == FAILURE) { return; } #else @@ -737,11 +737,11 @@ repeat: if (Z_TYPE(val_free) == IS_UNDEF) { if (Z_OBJ_HT_P(val)->get) { zval rv; - val = Z_OBJ_HT_P(val)->get(val, &rv TSRMLS_CC); + val = Z_OBJ_HT_P(val)->get(val, &rv); ZVAL_COPY_VALUE(&val_free, val); goto repeat; } else if (Z_OBJ_HT_P(val)->cast_object) { - if (Z_OBJ_HT_P(val)->cast_object(val, &val_free, IS_STRING TSRMLS_CC) == SUCCESS) { + if (Z_OBJ_HT_P(val)->cast_object(val, &val_free, IS_STRING) == SUCCESS) { val = &val_free; break; } @@ -759,7 +759,7 @@ repeat: c.flags = case_sensitive; /* non persistent */ c.name = zend_string_copy(name); c.module_number = PHP_USER_CONSTANT; - if (zend_register_constant(&c TSRMLS_CC) == SUCCESS) { + if (zend_register_constant(&c) == SUCCESS) { RETURN_TRUE; } else { RETURN_FALSE; @@ -775,7 +775,7 @@ ZEND_FUNCTION(defined) zend_string *name; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &name) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name) == FAILURE) { return; } #else @@ -784,7 +784,7 @@ ZEND_FUNCTION(defined) ZEND_PARSE_PARAMETERS_END(); #endif - if (zend_get_constant_ex(name, NULL, ZEND_FETCH_CLASS_SILENT TSRMLS_CC)) { + if (zend_get_constant_ex(name, NULL, ZEND_FETCH_CLASS_SILENT)) { RETURN_TRUE; } else { RETURN_FALSE; @@ -798,7 +798,7 @@ ZEND_FUNCTION(get_class) { zval *obj = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|o!", &obj) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|o!", &obj) == FAILURE) { RETURN_FALSE; } @@ -839,7 +839,7 @@ ZEND_FUNCTION(get_parent_class) zval *arg; zend_class_entry *ce = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z", &arg) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &arg) == FAILURE) { return; } @@ -855,7 +855,7 @@ ZEND_FUNCTION(get_parent_class) if (Z_TYPE_P(arg) == IS_OBJECT) { ce = Z_OBJ_P(arg)->ce; } else if (Z_TYPE_P(arg) == IS_STRING) { - ce = zend_lookup_class(Z_STR_P(arg) TSRMLS_CC); + ce = zend_lookup_class(Z_STR_P(arg)); } if (ce && ce->parent) { @@ -876,7 +876,7 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass) /* zend_bool retval; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zS|b", &obj, &class_name, &allow_string) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "zS|b", &obj, &class_name, &allow_string) == FAILURE) { return; } #else @@ -895,7 +895,7 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass) /* */ if (allow_string && Z_TYPE_P(obj) == IS_STRING) { - instance_ce = zend_lookup_class(Z_STR_P(obj) TSRMLS_CC); + instance_ce = zend_lookup_class(Z_STR_P(obj)); if (!instance_ce) { RETURN_FALSE; } @@ -905,14 +905,14 @@ static void is_a_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool only_subclass) /* RETURN_FALSE; } - ce = zend_lookup_class_ex(class_name, NULL, 0 TSRMLS_CC); + ce = zend_lookup_class_ex(class_name, NULL, 0); if (!ce) { retval = 0; } else { if (only_subclass && instance_ce == ce) { retval = 0; } else { - retval = instanceof_function(instance_ce, ce TSRMLS_CC); + retval = instanceof_function(instance_ce, ce); } } @@ -937,7 +937,7 @@ ZEND_FUNCTION(is_a) /* }}} */ /* {{{ add_class_vars */ -static void add_class_vars(zend_class_entry *ce, int statics, zval *return_value TSRMLS_DC) +static void add_class_vars(zend_class_entry *ce, int statics, zval *return_value) { zend_property_info *prop_info; zval *prop, prop_copy; @@ -973,7 +973,7 @@ static void add_class_vars(zend_class_entry *ce, int statics, zval *return_value /* this is necessary to make it able to work with default array * properties, returned to user */ if (Z_OPT_CONSTANT_P(prop)) { - zval_update_constant(prop, 0 TSRMLS_CC); + zval_update_constant(prop, 0); } zend_hash_add_new(Z_ARRVAL_P(return_value), key, prop); @@ -988,18 +988,18 @@ ZEND_FUNCTION(get_class_vars) zend_string *class_name; zend_class_entry *ce; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &class_name) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &class_name) == FAILURE) { return; } - ce = zend_lookup_class(class_name TSRMLS_CC); + ce = zend_lookup_class(class_name); if (!ce) { RETURN_FALSE; } else { array_init(return_value); - zend_update_class_constants(ce TSRMLS_CC); - add_class_vars(ce, 0, return_value TSRMLS_CC); - add_class_vars(ce, 1, return_value TSRMLS_CC); + zend_update_class_constants(ce); + add_class_vars(ce, 0, return_value); + add_class_vars(ce, 1, return_value); } } /* }}} */ @@ -1015,7 +1015,7 @@ ZEND_FUNCTION(get_object_vars) zend_object *zobj; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &obj) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &obj) == FAILURE) { return; } #else @@ -1028,7 +1028,7 @@ ZEND_FUNCTION(get_object_vars) RETURN_FALSE; } - properties = Z_OBJ_HT_P(obj)->get_properties(obj TSRMLS_CC); + properties = Z_OBJ_HT_P(obj)->get_properties(obj); if (properties == NULL) { RETURN_FALSE; @@ -1040,7 +1040,7 @@ ZEND_FUNCTION(get_object_vars) ZEND_HASH_FOREACH_STR_KEY_VAL_IND(properties, key, value) { if (key) { - if (zend_check_property_access(zobj, key TSRMLS_CC) == SUCCESS) { + if (zend_check_property_access(zobj, key) == SUCCESS) { /* Not separating references */ if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value); if (key->val[0] == 0) { @@ -1076,14 +1076,14 @@ ZEND_FUNCTION(get_class_methods) zend_function *mptr; zend_string *key; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &klass) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &klass) == FAILURE) { return; } if (Z_TYPE_P(klass) == IS_OBJECT) { ce = Z_OBJCE_P(klass); } else if (Z_TYPE_P(klass) == IS_STRING) { - ce = zend_lookup_class(Z_STR_P(klass) TSRMLS_CC); + ce = zend_lookup_class(Z_STR_P(klass)); } if (!ce) { @@ -1136,7 +1136,7 @@ ZEND_FUNCTION(method_exists) zend_class_entry * ce; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zS", &klass, &method_name) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "zS", &klass, &method_name) == FAILURE) { return; } #else @@ -1148,7 +1148,7 @@ ZEND_FUNCTION(method_exists) if (Z_TYPE_P(klass) == IS_OBJECT) { ce = Z_OBJCE_P(klass); } else if (Z_TYPE_P(klass) == IS_STRING) { - if ((ce = zend_lookup_class(Z_STR_P(klass) TSRMLS_CC)) == NULL) { + if ((ce = zend_lookup_class(Z_STR_P(klass))) == NULL) { RETURN_FALSE; } } else { @@ -1165,7 +1165,7 @@ ZEND_FUNCTION(method_exists) if (Z_TYPE_P(klass) == IS_OBJECT && Z_OBJ_HT_P(klass)->get_method != NULL - && (func = Z_OBJ_HT_P(klass)->get_method(&Z_OBJ_P(klass), method_name, NULL TSRMLS_CC)) != NULL + && (func = Z_OBJ_HT_P(klass)->get_method(&Z_OBJ_P(klass), method_name, NULL)) != NULL ) { if (func->type == ZEND_INTERNAL_FUNCTION && (func->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0 @@ -1198,7 +1198,7 @@ ZEND_FUNCTION(property_exists) zend_property_info *property_info; zval property_z; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zS", &object, &property) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "zS", &object, &property) == FAILURE) { return; } @@ -1207,7 +1207,7 @@ ZEND_FUNCTION(property_exists) } if (Z_TYPE_P(object) == IS_STRING) { - ce = zend_lookup_class(Z_STR_P(object) TSRMLS_CC); + ce = zend_lookup_class(Z_STR_P(object)); if (!ce) { RETURN_FALSE; } @@ -1227,7 +1227,7 @@ ZEND_FUNCTION(property_exists) if (Z_TYPE_P(object) == IS_OBJECT && Z_OBJ_HANDLER_P(object, has_property) && - Z_OBJ_HANDLER_P(object, has_property)(object, &property_z, 2, NULL TSRMLS_CC)) { + Z_OBJ_HANDLER_P(object, has_property)(object, &property_z, 2, NULL)) { RETURN_TRUE; } RETURN_FALSE; @@ -1244,7 +1244,7 @@ ZEND_FUNCTION(class_exists) zend_bool autoload = 1; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|b", &class_name, &autoload) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|b", &class_name, &autoload) == FAILURE) { return; } #else @@ -1269,7 +1269,7 @@ ZEND_FUNCTION(class_exists) RETURN_BOOL(ce && !((ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT)) > ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)); } - ce = zend_lookup_class(class_name TSRMLS_CC); + ce = zend_lookup_class(class_name); if (ce) { RETURN_BOOL((ce->ce_flags & (ZEND_ACC_INTERFACE | (ZEND_ACC_TRAIT - ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) == 0); } else { @@ -1287,7 +1287,7 @@ ZEND_FUNCTION(interface_exists) zend_bool autoload = 1; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|b", &iface_name, &autoload) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|b", &iface_name, &autoload) == FAILURE) { return; } #else @@ -1312,7 +1312,7 @@ ZEND_FUNCTION(interface_exists) RETURN_BOOL(ce && ce->ce_flags & ZEND_ACC_INTERFACE); } - ce = zend_lookup_class(iface_name TSRMLS_CC); + ce = zend_lookup_class(iface_name); if (ce) { RETURN_BOOL((ce->ce_flags & ZEND_ACC_INTERFACE) > 0); } else { @@ -1330,7 +1330,7 @@ ZEND_FUNCTION(trait_exists) zend_bool autoload = 1; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|b", &trait_name, &autoload) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|b", &trait_name, &autoload) == FAILURE) { return; } #else @@ -1355,7 +1355,7 @@ ZEND_FUNCTION(trait_exists) RETURN_BOOL(ce && ((ce->ce_flags & ZEND_ACC_TRAIT) > ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)); } - ce = zend_lookup_class(trait_name TSRMLS_CC); + ce = zend_lookup_class(trait_name); if (ce) { RETURN_BOOL((ce->ce_flags & ZEND_ACC_TRAIT) > ZEND_ACC_EXPLICIT_ABSTRACT_CLASS); } else { @@ -1374,7 +1374,7 @@ ZEND_FUNCTION(function_exists) zend_string *lcname; #ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) { return; } #else @@ -1414,15 +1414,15 @@ ZEND_FUNCTION(class_alias) size_t alias_name_len; zend_bool autoload = 1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Ss|b", &class_name, &alias_name, &alias_name_len, &autoload) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ss|b", &class_name, &alias_name, &alias_name_len, &autoload) == FAILURE) { return; } - ce = zend_lookup_class_ex(class_name, NULL, autoload TSRMLS_CC); + ce = zend_lookup_class_ex(class_name, NULL, autoload); if (ce) { if (ce->type == ZEND_USER_CLASS) { - if (zend_register_class_alias_ex(alias_name, alias_name_len, ce TSRMLS_CC) == SUCCESS) { + if (zend_register_class_alias_ex(alias_name, alias_name_len, ce) == SUCCESS) { RETURN_TRUE; } else { zend_error(E_WARNING, "Cannot redeclare class %s", alias_name); @@ -1446,7 +1446,7 @@ ZEND_FUNCTION(leak) { zend_long leakbytes=3; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &leakbytes) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &leakbytes) == FAILURE) { return; } @@ -1460,7 +1460,7 @@ ZEND_FUNCTION(leak_variable) zval *zv; zend_bool leak_data = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &zv, &leak_data) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|b", &zv, &leak_data) == FAILURE) { return; } @@ -1515,7 +1515,7 @@ ZEND_FUNCTION(trigger_error) char *message; size_t message_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &message, &message_len, &error_type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l", &message, &message_len, &error_type) == FAILURE) { return; } @@ -1544,14 +1544,14 @@ ZEND_FUNCTION(set_error_handler) zend_string *error_handler_name = NULL; zend_long error_type = E_ALL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &error_handler, &error_type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|l", &error_handler, &error_type) == FAILURE) { return; } if (Z_TYPE_P(error_handler) != IS_NULL) { /* NULL == unset */ - if (!zend_is_callable(error_handler, 0, &error_handler_name TSRMLS_CC)) { + if (!zend_is_callable(error_handler, 0, &error_handler_name)) { zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback", - get_active_function_name(TSRMLS_C), error_handler_name?error_handler_name->val:"unknown"); + get_active_function_name(), error_handler_name?error_handler_name->val:"unknown"); zend_string_release(error_handler_name); return; } @@ -1608,14 +1608,14 @@ ZEND_FUNCTION(set_exception_handler) zval *exception_handler; zend_string *exception_handler_name = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &exception_handler) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &exception_handler) == FAILURE) { return; } if (Z_TYPE_P(exception_handler) != IS_NULL) { /* NULL == unset */ - if (!zend_is_callable(exception_handler, 0, &exception_handler_name TSRMLS_CC)) { + if (!zend_is_callable(exception_handler, 0, &exception_handler_name)) { zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback", - get_active_function_name(TSRMLS_C), exception_handler_name?exception_handler_name->val:"unknown"); + get_active_function_name(), exception_handler_name?exception_handler_name->val:"unknown"); zend_string_release(exception_handler_name); return; } @@ -1655,7 +1655,7 @@ ZEND_FUNCTION(restore_exception_handler) } /* }}} */ -static int copy_class_or_interface_name(zval *el TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ +static int copy_class_or_interface_name(zval *el, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { zend_class_entry *ce = (zend_class_entry *)Z_PTR_P(el); zval *array = va_arg(args, zval *); @@ -1689,7 +1689,7 @@ ZEND_FUNCTION(get_declared_traits) } array_init(return_value); - zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, copy_class_or_interface_name, 3, return_value, mask, comply); + zend_hash_apply_with_arguments(EG(class_table), copy_class_or_interface_name, 3, return_value, mask, comply); } /* }}} */ @@ -1705,7 +1705,7 @@ ZEND_FUNCTION(get_declared_classes) } array_init(return_value); - zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, copy_class_or_interface_name, 3, return_value, mask, comply); + zend_hash_apply_with_arguments(EG(class_table), copy_class_or_interface_name, 3, return_value, mask, comply); } /* }}} */ @@ -1721,11 +1721,11 @@ ZEND_FUNCTION(get_declared_interfaces) } array_init(return_value); - zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, copy_class_or_interface_name, 3, return_value, mask, comply); + zend_hash_apply_with_arguments(EG(class_table), copy_class_or_interface_name, 3, return_value, mask, comply); } /* }}} */ -static int copy_function_name(zval *zv TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ +static int copy_function_name(zval *zv, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */ { zend_function *func = Z_PTR_P(zv); zval *internal_ar = va_arg(args, zval *), @@ -1759,7 +1759,7 @@ ZEND_FUNCTION(get_defined_functions) array_init(&user); array_init(return_value); - zend_hash_apply_with_arguments(EG(function_table) TSRMLS_CC, copy_function_name, 2, &internal, &user); + zend_hash_apply_with_arguments(EG(function_table), copy_function_name, 2, &internal, &user); zend_hash_str_add_new(Z_ARRVAL_P(return_value), "internal", sizeof("internal")-1, &internal); zend_hash_str_add_new(Z_ARRVAL_P(return_value), "user", sizeof("user")-1, &user); @@ -1770,7 +1770,7 @@ ZEND_FUNCTION(get_defined_functions) Returns an associative array of names and values of all currently defined variable names (variables in the current scope) */ ZEND_FUNCTION(get_defined_vars) { - zend_array *symbol_table = zend_rebuild_symbol_table(TSRMLS_C); + zend_array *symbol_table = zend_rebuild_symbol_table(); ZVAL_NEW_ARR(return_value); zend_array_dup(Z_ARRVAL_P(return_value), &symbol_table->ht); @@ -1788,7 +1788,7 @@ ZEND_FUNCTION(create_function) int retval; char *eval_name; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &function_args, &function_args_len, &function_code, &function_code_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &function_args, &function_args_len, &function_code, &function_code_len) == FAILURE) { return; } @@ -1813,8 +1813,8 @@ ZEND_FUNCTION(create_function) eval_code[eval_code_length++] = '}'; eval_code[eval_code_length] = '\0'; - eval_name = zend_make_compiled_string_description("runtime-created function" TSRMLS_CC); - retval = zend_eval_stringl(eval_code, eval_code_length, NULL, eval_name TSRMLS_CC); + eval_name = zend_make_compiled_string_description("runtime-created function"); + retval = zend_eval_stringl(eval_code, eval_code_length, NULL, eval_name); efree(eval_code); efree(eval_name); @@ -1871,11 +1871,11 @@ ZEND_FUNCTION(get_resource_type) const char *resource_type; zval *z_resource_type; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_resource_type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_resource_type) == FAILURE) { return; } - resource_type = zend_rsrc_list_get_rsrc_type(Z_RES_P(z_resource_type) TSRMLS_CC); + resource_type = zend_rsrc_list_get_rsrc_type(Z_RES_P(z_resource_type)); if (resource_type) { RETURN_STRING(resource_type); } else { @@ -1893,7 +1893,7 @@ ZEND_FUNCTION(get_resources) zend_ulong index; zval *val; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|S", &type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|S", &type) == FAILURE) { return; } @@ -1932,7 +1932,7 @@ ZEND_FUNCTION(get_resources) } /* }}} */ -static int add_extension_info(zval *item, void *arg TSRMLS_DC) /* {{{ */ +static int add_extension_info(zval *item, void *arg) /* {{{ */ { zval *name_array = (zval *)arg; zend_module_entry *module = (zend_module_entry*)Z_PTR_P(item); @@ -1941,7 +1941,7 @@ static int add_extension_info(zval *item, void *arg TSRMLS_DC) /* {{{ */ } /* }}} */ -static int add_zendext_info(zend_extension *ext, void *arg TSRMLS_DC) /* {{{ */ +static int add_zendext_info(zend_extension *ext, void *arg) /* {{{ */ { zval *name_array = (zval *)arg; add_next_index_string(name_array, ext->name); @@ -1949,7 +1949,7 @@ static int add_zendext_info(zend_extension *ext, void *arg TSRMLS_DC) /* {{{ */ } /* }}} */ -static int add_constant_info(zval *item, void *arg TSRMLS_DC) /* {{{ */ +static int add_constant_info(zval *item, void *arg) /* {{{ */ { zval *name_array = (zval *)arg; zend_constant *constant = (zend_constant*)Z_PTR_P(item); @@ -1972,16 +1972,16 @@ ZEND_FUNCTION(get_loaded_extensions) { zend_bool zendext = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &zendext) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &zendext) == FAILURE) { return; } array_init(return_value); if (zendext) { - zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t)add_zendext_info, return_value TSRMLS_CC); + zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t)add_zendext_info, return_value); } else { - zend_hash_apply_with_argument(&module_registry, add_extension_info, return_value TSRMLS_CC); + zend_hash_apply_with_argument(&module_registry, add_extension_info, return_value); } } /* }}} */ @@ -1992,7 +1992,7 @@ ZEND_FUNCTION(get_defined_constants) { zend_bool categorize = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &categorize) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &categorize) == FAILURE) { return; } @@ -2043,12 +2043,12 @@ ZEND_FUNCTION(get_defined_constants) efree(module_names); efree(modules); } else { - zend_hash_apply_with_argument(EG(zend_constants), add_constant_info, return_value TSRMLS_CC); + zend_hash_apply_with_argument(EG(zend_constants), add_constant_info, return_value); } } /* }}} */ -static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array TSRMLS_DC) /* {{{ */ +static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array) /* {{{ */ { uint32_t num_args = ZEND_CALL_NUM_ARGS(call); @@ -2084,7 +2084,7 @@ static void debug_backtrace_get_args(zend_execute_data *call, zval *arg_array TS } /* }}} */ -void debug_print_backtrace_args(zval *arg_array TSRMLS_DC) /* {{{ */ +void debug_print_backtrace_args(zval *arg_array) /* {{{ */ { zval *tmp; int i = 0; @@ -2093,7 +2093,7 @@ void debug_print_backtrace_args(zval *arg_array TSRMLS_DC) /* {{{ */ if (i++) { ZEND_PUTS(", "); } - zend_print_flat_zval_r(tmp TSRMLS_CC); + zend_print_flat_zval_r(tmp); } ZEND_HASH_FOREACH_END(); } /* }}} */ @@ -2115,7 +2115,7 @@ ZEND_FUNCTION(debug_print_backtrace) zend_long options = 0; zend_long limit = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &options, &limit) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ll", &options, &limit) == FAILURE) { return; } @@ -2199,7 +2199,7 @@ ZEND_FUNCTION(debug_print_backtrace) } if (func->type != ZEND_EVAL_CODE) { if ((options & DEBUG_BACKTRACE_IGNORE_ARGS) == 0) { - debug_backtrace_get_args(call, &arg_array TSRMLS_CC); + debug_backtrace_get_args(call, &arg_array); } } } else { @@ -2249,7 +2249,7 @@ ZEND_FUNCTION(debug_print_backtrace) } zend_printf("%s(", function_name); if (Z_TYPE(arg_array) != IS_UNDEF) { - debug_print_backtrace_args(&arg_array TSRMLS_CC); + debug_print_backtrace_args(&arg_array); zval_ptr_dtor(&arg_array); } if (filename) { @@ -2285,7 +2285,7 @@ ZEND_FUNCTION(debug_print_backtrace) /* }}} */ -ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int options, int limit TSRMLS_DC) /* {{{ */ +ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int options, int limit) /* {{{ */ { zend_execute_data *call, *ptr, *skip; zend_object *object; @@ -2427,7 +2427,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int func->type != ZEND_EVAL_CODE) { zval args; - debug_backtrace_get_args(call, &args TSRMLS_CC); + debug_backtrace_get_args(call, &args); add_assoc_zval_ex(&stack_frame, "args", sizeof("args")-1, &args); } } else { @@ -2497,11 +2497,11 @@ ZEND_FUNCTION(debug_backtrace) zend_long options = DEBUG_BACKTRACE_PROVIDE_OBJECT; zend_long limit = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &options, &limit) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ll", &options, &limit) == FAILURE) { return; } - zend_fetch_debug_backtrace(return_value, 1, options, limit TSRMLS_CC); + zend_fetch_debug_backtrace(return_value, 1, options, limit); } /* }}} */ @@ -2513,7 +2513,7 @@ ZEND_FUNCTION(extension_loaded) size_t extension_name_len; zend_string *lcname; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &extension_name, &extension_name_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &extension_name, &extension_name_len) == FAILURE) { return; } @@ -2539,7 +2539,7 @@ ZEND_FUNCTION(get_extension_funcs) zend_module_entry *module; zend_function *zif; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &extension_name, &extension_name_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &extension_name, &extension_name_len) == FAILURE) { return; } if (strncasecmp(extension_name, "zend", sizeof("zend"))) { |