summaryrefslogtreecommitdiff
path: root/src/sp_disabled_functions.c
diff options
context:
space:
mode:
authorjvoisin2017-10-13 16:20:32 +0200
committerjvoisin2017-10-13 16:20:32 +0200
commit780dcab62ebbf87aee8c65616fe0b0c57b2c8ea0 (patch)
tree7bb6dcfec26f9d187a44b0a8b2507a2e1d02ea91 /src/sp_disabled_functions.c
parentd875912a0528931c0828edfe30c37c01b559b761 (diff)
Rename a confusing structure member
`regexp` is more confusing than `value_r`
Diffstat (limited to 'src/sp_disabled_functions.c')
-rw-r--r--src/sp_disabled_functions.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index 758978c..0f5f859 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -80,7 +80,7 @@ static bool is_local_var_matching(zend_execute_data *execute_data, const sp_disa
80 } 80 }
81 if (Z_TYPE_P(value) != IS_ARRAY) { 81 if (Z_TYPE_P(value) != IS_ARRAY) {
82 char *var_value_str = sp_convert_to_string(value); 82 char *var_value_str = sp_convert_to_string(value);
83 if (true == sp_match_value(var_value_str, config_node->value, config_node->regexp)) { 83 if (true == sp_match_value(var_value_str, config_node->value, config_node->value_r)) {
84 efree(var_value_str); 84 efree(var_value_str);
85 EG(current_execute_data) = orig_execute_data; 85 EG(current_execute_data) = orig_execute_data;
86 return true; 86 return true;
@@ -214,13 +214,13 @@ bool should_disable(zend_execute_data* execute_data) {
214 if (config_node->param_is_array == true) { 214 if (config_node->param_is_array == true) {
215 if (true == sp_match_array_key_recurse( 215 if (true == sp_match_array_key_recurse(
216 arg_value, config_node->param_array_keys, 216 arg_value, config_node->param_array_keys,
217 config_node->value, config_node->regexp)) { 217 config_node->value, config_node->value_r)) {
218 arg_matched = true; 218 arg_matched = true;
219 break; 219 break;
220 } 220 }
221 } else { // match on all keys, but don't go into subarray 221 } else { // match on all keys, but don't go into subarray
222 if (true == sp_match_array_key(arg_value, config_node->value, 222 if (true == sp_match_array_key(arg_value, config_node->value,
223 config_node->regexp)) { 223 config_node->value_r)) {
224 arg_matched = true; 224 arg_matched = true;
225 break; 225 break;
226 } 226 }
@@ -228,7 +228,7 @@ bool should_disable(zend_execute_data* execute_data) {
228 } else { 228 } else {
229 arg_value_str = sp_convert_to_string(arg_value); 229 arg_value_str = sp_convert_to_string(arg_value);
230 if (true == sp_match_value(arg_value_str, config_node->value, 230 if (true == sp_match_value(arg_value_str, config_node->value,
231 config_node->regexp)) { 231 config_node->value_r)) {
232 arg_matched = true; 232 arg_matched = true;
233 break; 233 break;
234 } 234 }