summaryrefslogtreecommitdiff
path: root/ext/filter/filter.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/filter/filter.c')
-rw-r--r--ext/filter/filter.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index d1b2abf2aa..20eac4577b 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -78,8 +78,8 @@ static const filter_list_entry filter_list[] = {
#define PARSE_SESSION 6
#endif
-static unsigned int php_sapi_filter(int arg, char *var, char **val, size_t val_len, size_t *new_val_len TSRMLS_DC);
-static unsigned int php_sapi_filter_init(TSRMLS_D);
+static unsigned int php_sapi_filter(int arg, char *var, char **val, size_t val_len, size_t *new_val_len);
+static unsigned int php_sapi_filter_init(void);
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_filter_input, 0, 0, 2)
@@ -288,7 +288,7 @@ PHP_MINIT_FUNCTION(filter)
REGISTER_LONG_CONSTANT("FILTER_FLAG_HOSTNAME", FILTER_FLAG_HOSTNAME, CONST_CS | CONST_PERSISTENT);
- sapi_register_input_filter(php_sapi_filter, php_sapi_filter_init TSRMLS_CC);
+ sapi_register_input_filter(php_sapi_filter, php_sapi_filter_init);
return SUCCESS;
}
@@ -357,7 +357,7 @@ static filter_list_entry php_find_filter(zend_long id) /* {{{ */
}
/* }}} */
-static unsigned int php_sapi_filter_init(TSRMLS_D)
+static unsigned int php_sapi_filter_init(void)
{
ZVAL_UNDEF(&IF_G(get_array));
ZVAL_UNDEF(&IF_G(post_array));
@@ -368,7 +368,7 @@ static unsigned int php_sapi_filter_init(TSRMLS_D)
return SUCCESS;
}
-static void php_zval_filter(zval *value, zend_long filter, zend_long flags, zval *options, char* charset, zend_bool copy TSRMLS_DC) /* {{{ */
+static void php_zval_filter(zval *value, zend_long filter, zend_long flags, zval *options, char* charset, zend_bool copy) /* {{{ */
{
filter_list_entry filter_func;
@@ -398,7 +398,7 @@ static void php_zval_filter(zval *value, zend_long filter, zend_long flags, zval
/* Here be strings */
convert_to_string(value);
- filter_func.function(value, flags, options, charset TSRMLS_CC);
+ filter_func.function(value, flags, options, charset);
if (options && (Z_TYPE_P(options) == IS_ARRAY || Z_TYPE_P(options) == IS_OBJECT) &&
((flags & FILTER_NULL_ON_FAILURE && Z_TYPE_P(value) == IS_NULL) ||
@@ -412,7 +412,7 @@ static void php_zval_filter(zval *value, zend_long filter, zend_long flags, zval
}
/* }}} */
-static unsigned int php_sapi_filter(int arg, char *var, char **val, size_t val_len, size_t *new_val_len TSRMLS_DC) /* {{{ */
+static unsigned int php_sapi_filter(int arg, char *var, char **val, size_t val_len, size_t *new_val_len) /* {{{ */
{
zval new_var, raw_var;
zval *array_ptr = NULL, *orig_array_ptr = NULL;
@@ -455,14 +455,14 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, size_t val_l
if (array_ptr) {
/* Store the RAW variable internally */
ZVAL_STRINGL(&raw_var, *val, val_len);
- php_register_variable_ex(var, &raw_var, array_ptr TSRMLS_CC);
+ php_register_variable_ex(var, &raw_var, array_ptr);
}
if (val_len) {
/* Register mangled variable */
if (IF_G(default_filter) != FILTER_UNSAFE_RAW) {
ZVAL_STRINGL(&new_var, *val, val_len);
- php_zval_filter(&new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL, 0 TSRMLS_CC);
+ php_zval_filter(&new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL, 0);
} else {
ZVAL_STRINGL(&new_var, *val, val_len);
}
@@ -471,7 +471,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, size_t val_l
}
if (orig_array_ptr) {
- php_register_variable_ex(var, &new_var, orig_array_ptr TSRMLS_CC);
+ php_register_variable_ex(var, &new_var, orig_array_ptr);
}
if (retval) {
@@ -491,7 +491,7 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, size_t val_l
}
/* }}} */
-static void php_zval_filter_recursive(zval *value, zend_long filter, zend_long flags, zval *options, char *charset, zend_bool copy TSRMLS_DC) /* {{{ */
+static void php_zval_filter_recursive(zval *value, zend_long filter, zend_long flags, zval *options, char *charset, zend_bool copy) /* {{{ */
{
if (Z_TYPE_P(value) == IS_ARRAY) {
zval *element;
@@ -505,19 +505,19 @@ static void php_zval_filter_recursive(zval *value, zend_long filter, zend_long f
SEPARATE_ZVAL_NOREF(element);
if (Z_TYPE_P(element) == IS_ARRAY) {
Z_ARRVAL_P(element)->u.v.nApplyCount++;
- php_zval_filter_recursive(element, filter, flags, options, charset, copy TSRMLS_CC);
+ php_zval_filter_recursive(element, filter, flags, options, charset, copy);
Z_ARRVAL_P(element)->u.v.nApplyCount--;
} else {
- php_zval_filter(element, filter, flags, options, charset, copy TSRMLS_CC);
+ php_zval_filter(element, filter, flags, options, charset, copy);
}
} ZEND_HASH_FOREACH_END();
} else {
- php_zval_filter(value, filter, flags, options, charset, copy TSRMLS_CC);
+ php_zval_filter(value, filter, flags, options, charset, copy);
}
}
/* }}} */
-static zval *php_filter_get_storage(zend_long arg TSRMLS_DC)/* {{{ */
+static zval *php_filter_get_storage(zend_long arg)/* {{{ */
{
zval *array_ptr = NULL;
@@ -535,7 +535,7 @@ static zval *php_filter_get_storage(zend_long arg TSRMLS_DC)/* {{{ */
case PARSE_SERVER:
if (PG(auto_globals_jit)) {
zend_string *name = zend_string_init("_SERVER", sizeof("_SERVER") - 1, 0);
- zend_is_auto_global(name TSRMLS_CC);
+ zend_is_auto_global(name);
zend_string_release(name);
}
array_ptr = &IF_G(server_array);
@@ -543,18 +543,18 @@ static zval *php_filter_get_storage(zend_long arg TSRMLS_DC)/* {{{ */
case PARSE_ENV:
if (PG(auto_globals_jit)) {
zend_string *name = zend_string_init("_ENV", sizeof("_ENV") - 1, 0);
- zend_is_auto_global(name TSRMLS_CC);
+ zend_is_auto_global(name);
zend_string_release(name);
}
array_ptr = &IF_G(env_array) ? &IF_G(env_array) : &PG(http_globals)[TRACK_VARS_ENV];
break;
case PARSE_SESSION:
/* FIXME: Implement session source */
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "INPUT_SESSION is not yet implemented");
+ php_error_docref(NULL, E_WARNING, "INPUT_SESSION is not yet implemented");
break;
case PARSE_REQUEST:
/* FIXME: Implement request source */
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "INPUT_REQUEST is not yet implemented");
+ php_error_docref(NULL, E_WARNING, "INPUT_REQUEST is not yet implemented");
break;
}
@@ -571,11 +571,11 @@ PHP_FUNCTION(filter_has_var)
zend_string *var;
zval *array_ptr = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lS", &arg, &var) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "lS", &arg, &var) == FAILURE) {
RETURN_FALSE;
}
- array_ptr = php_filter_get_storage(arg TSRMLS_CC);
+ array_ptr = php_filter_get_storage(arg);
if (array_ptr && HASH_OF(array_ptr) && zend_hash_exists(HASH_OF(array_ptr), var)) {
RETURN_TRUE;
@@ -585,7 +585,7 @@ PHP_FUNCTION(filter_has_var)
}
/* }}} */
-static void php_filter_call(zval *filtered, zend_long filter, zval *filter_args, const int copy, zend_long filter_flags TSRMLS_DC) /* {{{ */
+static void php_filter_call(zval *filtered, zend_long filter, zval *filter_args, const int copy, zend_long filter_flags) /* {{{ */
{
zval *options = NULL;
zval *option;
@@ -642,7 +642,7 @@ static void php_filter_call(zval *filtered, zend_long filter, zval *filter_args,
}
return;
}
- php_zval_filter_recursive(filtered, filter, filter_flags, options, charset, copy TSRMLS_CC);
+ php_zval_filter_recursive(filtered, filter, filter_flags, options, charset, copy);
return;
}
if (filter_flags & FILTER_REQUIRE_ARRAY) {
@@ -658,7 +658,7 @@ static void php_filter_call(zval *filtered, zend_long filter, zval *filter_args,
return;
}
- php_zval_filter(filtered, filter, filter_flags, options, charset, copy TSRMLS_CC);
+ php_zval_filter(filtered, filter, filter_flags, options, charset, copy);
if (filter_flags & FILTER_FORCE_ARRAY) {
zval tmp;
ZVAL_COPY_VALUE(&tmp, filtered);
@@ -668,7 +668,7 @@ static void php_filter_call(zval *filtered, zend_long filter, zval *filter_args,
}
/* }}} */
-static void php_filter_array_handler(zval *input, zval *op, zval *return_value, zend_bool add_empty TSRMLS_DC) /* {{{ */
+static void php_filter_array_handler(zval *input, zval *op, zval *return_value, zend_bool add_empty) /* {{{ */
{
zend_string *arg_key;
zval *tmp, *arg_elm;
@@ -676,22 +676,22 @@ static void php_filter_array_handler(zval *input, zval *op, zval *return_value,
if (!op) {
zval_ptr_dtor(return_value);
ZVAL_DUP(return_value, input);
- php_filter_call(return_value, FILTER_DEFAULT, NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
+ php_filter_call(return_value, FILTER_DEFAULT, NULL, 0, FILTER_REQUIRE_ARRAY);
} else if (Z_TYPE_P(op) == IS_LONG) {
zval_ptr_dtor(return_value);
ZVAL_DUP(return_value, input);
- php_filter_call(return_value, Z_LVAL_P(op), NULL, 0, FILTER_REQUIRE_ARRAY TSRMLS_CC);
+ php_filter_call(return_value, Z_LVAL_P(op), NULL, 0, FILTER_REQUIRE_ARRAY);
} else if (Z_TYPE_P(op) == IS_ARRAY) {
array_init(return_value);
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(op), arg_key, arg_elm) {
if (arg_key == NULL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric keys are not allowed in the definition array");
+ php_error_docref(NULL, E_WARNING, "Numeric keys are not allowed in the definition array");
zval_ptr_dtor(return_value);
RETURN_FALSE;
}
if (arg_key->len == 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty keys are not allowed in the definition array");
+ php_error_docref(NULL, E_WARNING, "Empty keys are not allowed in the definition array");
zval_ptr_dtor(return_value);
RETURN_FALSE;
}
@@ -703,7 +703,7 @@ static void php_filter_array_handler(zval *input, zval *op, zval *return_value,
zval nval;
ZVAL_DEREF(tmp);
ZVAL_DUP(&nval, tmp);
- php_filter_call(&nval, -1, arg_elm, 0, FILTER_REQUIRE_SCALAR TSRMLS_CC);
+ php_filter_call(&nval, -1, arg_elm, 0, FILTER_REQUIRE_SCALAR);
zend_hash_update(Z_ARRVAL_P(return_value), arg_key, &nval);
}
} ZEND_HASH_FOREACH_END();
@@ -723,7 +723,7 @@ PHP_FUNCTION(filter_input)
zval *input = NULL;
zend_string *var;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lS|lz", &fetch_from, &var, &filter, &filter_args) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "lS|lz", &fetch_from, &var, &filter, &filter_args) == FAILURE) {
return;
}
@@ -731,7 +731,7 @@ PHP_FUNCTION(filter_input)
RETURN_FALSE;
}
- input = php_filter_get_storage(fetch_from TSRMLS_CC);
+ input = php_filter_get_storage(fetch_from);
if (!input || !HASH_OF(input) || (tmp = zend_hash_find(HASH_OF(input), var)) == NULL) {
zend_long filter_flags = 0;
@@ -765,7 +765,7 @@ PHP_FUNCTION(filter_input)
ZVAL_DUP(return_value, tmp);
- php_filter_call(return_value, filter, filter_args, 1, FILTER_REQUIRE_SCALAR TSRMLS_CC);
+ php_filter_call(return_value, filter, filter_args, 1, FILTER_REQUIRE_SCALAR);
}
/* }}} */
@@ -777,7 +777,7 @@ PHP_FUNCTION(filter_var)
zend_long filter = FILTER_DEFAULT;
zval *filter_args = NULL, *data;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/|lz", &data, &filter, &filter_args) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "z/|lz", &data, &filter, &filter_args) == FAILURE) {
return;
}
@@ -787,7 +787,7 @@ PHP_FUNCTION(filter_var)
ZVAL_DUP(return_value, data);
- php_filter_call(return_value, filter, filter_args, 1, FILTER_REQUIRE_SCALAR TSRMLS_CC);
+ php_filter_call(return_value, filter, filter_args, 1, FILTER_REQUIRE_SCALAR);
}
/* }}} */
@@ -800,7 +800,7 @@ PHP_FUNCTION(filter_input_array)
zval *array_input = NULL, *op = NULL;
zend_bool add_empty = 1;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|zb", &fetch_from, &op, &add_empty) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|zb", &fetch_from, &op, &add_empty) == FAILURE) {
return;
}
@@ -808,7 +808,7 @@ PHP_FUNCTION(filter_input_array)
RETURN_FALSE;
}
- array_input = php_filter_get_storage(fetch_from TSRMLS_CC);
+ array_input = php_filter_get_storage(fetch_from);
if (!array_input || !HASH_OF(array_input)) {
zend_long filter_flags = 0;
@@ -833,7 +833,7 @@ PHP_FUNCTION(filter_input_array)
}
}
- php_filter_array_handler(array_input, op, return_value, add_empty TSRMLS_CC);
+ php_filter_array_handler(array_input, op, return_value, add_empty);
}
/* }}} */
@@ -845,7 +845,7 @@ PHP_FUNCTION(filter_var_array)
zval *array_input = NULL, *op = NULL;
zend_bool add_empty = 1;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|zb", &array_input, &op, &add_empty) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|zb", &array_input, &op, &add_empty) == FAILURE) {
return;
}
@@ -853,7 +853,7 @@ PHP_FUNCTION(filter_var_array)
RETURN_FALSE;
}
- php_filter_array_handler(array_input, op, return_value, add_empty TSRMLS_CC);
+ php_filter_array_handler(array_input, op, return_value, add_empty);
}
/* }}} */
@@ -883,7 +883,7 @@ PHP_FUNCTION(filter_id)
int size = sizeof(filter_list) / sizeof(filter_list_entry);
char *filter;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filter, &filter_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &filter, &filter_len) == FAILURE) {
return;
}
View Lorry Controller Status