From 780dcab62ebbf87aee8c65616fe0b0c57b2c8ea0 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 13 Oct 2017 16:20:32 +0200
Subject: Rename a confusing structure member

`regexp` is more confusing than `value_r`
---
 src/sp_config.h             | 2 +-
 src/sp_config_keywords.c    | 4 ++--
 src/sp_disabled_functions.c | 8 ++++----
 src/sp_execute.c            | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/sp_config.h b/src/sp_config.h
index cad4234..0877ebb 100644
--- a/src/sp_config.h
+++ b/src/sp_config.h
@@ -82,7 +82,7 @@ typedef struct {
   pcre *r_ret;
   sp_php_type ret_type;
 
-  pcre *regexp;
+  pcre *value_r;
   char *value;
 
   char *dump;
diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index 5e31c41..29f1bfc 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -160,7 +160,7 @@ int parse_disabled_functions(char *line) {
       {parse_empty, SP_TOKEN_DROP, &(df->drop)},
       {parse_str, SP_TOKEN_HASH, &(df->hash)},
       {parse_str, SP_TOKEN_PARAM, &(df->param)},
-      {parse_regexp, SP_TOKEN_VALUE_REGEXP, &(df->regexp)},
+      {parse_regexp, SP_TOKEN_VALUE_REGEXP, &(df->value_r)},
       {parse_str, SP_TOKEN_VALUE, &(df->value)},
       {parse_regexp, SP_TOKEN_PARAM_REGEXP, &(df->r_param)},
       {parse_php_type, SP_TOKEN_PARAM_TYPE, &(df->param_type)},
@@ -183,7 +183,7 @@ int parse_disabled_functions(char *line) {
     df->enable = true;
   }
 
-  if (df->value && df->regexp) {
+  if (df->value && df->value_r) {
     sp_log_err("config",
                "Invalid configuration line: 'sp.disabled_functions%s':"
                "'.value' and '.regexp' are mutually exclusives on line %zu.",
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
         }
 	if (Z_TYPE_P(value) != IS_ARRAY) {
 	  char *var_value_str = sp_convert_to_string(value);
-	  if (true == sp_match_value(var_value_str, config_node->value, config_node->regexp)) {
+	  if (true == sp_match_value(var_value_str, config_node->value, config_node->value_r)) {
 	    efree(var_value_str);
 	    EG(current_execute_data) = orig_execute_data;
 	    return true;
@@ -214,13 +214,13 @@ bool should_disable(zend_execute_data* execute_data) {
             if (config_node->param_is_array == true) {
               if (true == sp_match_array_key_recurse(
                               arg_value, config_node->param_array_keys,
-                              config_node->value, config_node->regexp)) {
+                              config_node->value, config_node->value_r)) {
                 arg_matched = true;
                 break;
               }
             } else {  // match on all keys, but don't go into subarray
               if (true == sp_match_array_key(arg_value, config_node->value,
-                                             config_node->regexp)) {
+                                             config_node->value_r)) {
                 arg_matched = true;
                 break;
               }
@@ -228,7 +228,7 @@ bool should_disable(zend_execute_data* execute_data) {
           } else {
             arg_value_str = sp_convert_to_string(arg_value);
             if (true == sp_match_value(arg_value_str, config_node->value,
-                                       config_node->regexp)) {
+                                       config_node->value_r)) {
               arg_matched = true;
               break;
             }
diff --git a/src/sp_execute.c b/src/sp_execute.c
index 59f6884..fb4a313 100644
--- a/src/sp_execute.c
+++ b/src/sp_execute.c
@@ -37,7 +37,7 @@ static void construct_include_handler(const char * const filename) {
 
     while (config) {
       sp_disabled_function *config_node = (sp_disabled_function*)(config->data);
-      if (true == sp_match_value(filename, config_node->value, config_node->regexp)) {
+      if (true == sp_match_value(filename, config_node->value, config_node->value_r)) {
         if (true == config_node->allow) {
           return;
         }
-- 
cgit v1.3