summaryrefslogtreecommitdiff
path: root/src/sp_disabled_functions.c
diff options
context:
space:
mode:
authorjvoisin2018-07-13 23:36:06 +0200
committerjvoisin2018-07-13 23:36:06 +0200
commit02afd6c84f5e4f11b1de054f36d7d1da87206def (patch)
tree934b8669e520382ce9776c61197c1391cddeca35 /src/sp_disabled_functions.c
parent99f9ecae9a5edf5d36f5de62ccf60f9d9146057a (diff)
Yet an other pass of clang-format
Diffstat (limited to 'src/sp_disabled_functions.c')
-rw-r--r--src/sp_disabled_functions.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index 2e459a9..4a4f7d8 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -373,11 +373,8 @@ bool should_disable(zend_execute_data* execute_data,
373 } 373 }
374 374
375 if (config_node->r_value || config_node->value) { 375 if (config_node->r_value || config_node->value) {
376 if (check_is_builtin_name(config_node) && 376 if (check_is_builtin_name(config_node) && !config_node->var &&
377 !config_node->var && 377 !config_node->param && !config_node->r_param && !config_node->key &&
378 !config_node->param &&
379 !config_node->r_param &&
380 !config_node->key &&
381 !config_node->r_key) { 378 !config_node->r_key) {
382 if (false == is_param_matching(execute_data, config_node, builtin_param, 379 if (false == is_param_matching(execute_data, config_node, builtin_param,
383 &arg_name, builtin_param_name, 380 &arg_name, builtin_param_name,
@@ -422,8 +419,7 @@ bool should_drop_on_ret_ht(zval* return_value, const char* function_name,
422 419
423 ht_entry = zend_hash_str_find_ptr(ht, function_name, strlen(function_name)); 420 ht_entry = zend_hash_str_find_ptr(ht, function_name, strlen(function_name));
424 421
425 if (ht_entry && 422 if (ht_entry && should_drop_on_ret(return_value, ht_entry, function_name)) {
426 should_drop_on_ret(return_value, ht_entry, function_name)) {
427 ret = true; 423 ret = true;
428 } else if (config && config->data) { 424 } else if (config && config->data) {
429 ret = should_drop_on_ret(return_value, config, function_name); 425 ret = should_drop_on_ret(return_value, config, function_name);