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_keywords.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/sp_config_keywords.c')

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.",
-- 
cgit v1.3