From 24276c548e5ac03e167a2ded7f8927ae5466d449 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Tue, 6 Feb 2018 14:51:15 +0100
Subject: Make our API consistent

---
 src/sp_config_keywords.c    | 6 +++---
 src/sp_disabled_functions.c | 4 ++--
 src/sp_var_parser.c         | 4 ++--
 src/sp_var_parser.h         | 4 ++--
 src/sp_var_value.c          | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index 959fa38..d110749 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -344,10 +344,10 @@ int parse_disabled_functions(char *line) {
       char *new = pecalloc(strlen(param) + 2, 1, 1);
       new[0] = '$';
       memcpy(new + 1, param, strlen(param));
-      df->param = parse_var(new);
+      df->param = sp_parse_var(new);
       free(new);
     } else {
-      df->param = parse_var(param);
+      df->param = sp_parse_var(param);
     }
     if (!df->param) {
       sp_log_err("config", "Invalid value '%s' for `param` on line %zu.", param,
@@ -358,7 +358,7 @@ int parse_disabled_functions(char *line) {
 
   if (var) {
     if (*var) {
-      df->var = parse_var(var);
+      df->var = sp_parse_var(var);
       if (!df->var) {
         sp_log_err("config", "Invalid value '%s' for `var` on line %zu.", var,
                    sp_line_no);
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index eb0ba83..779240e 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -67,7 +67,7 @@ static bool is_local_var_matching(
     const sp_disabled_function* const config_node) {
   zval* var_value;
 
-  var_value = get_value(execute_data, config_node->var, false);
+  var_value = sp_get_var_value(execute_data, config_node->var, false);
   if (var_value) {
     if (Z_TYPE_P(var_value) == IS_ARRAY) {
       if (config_node->key || config_node->r_key) {
@@ -187,7 +187,7 @@ static bool is_param_matching(zend_execute_data* execute_data,
     }
   } else if (config_node->param) {
     *arg_name = config_node->param->value;
-    arg_value = get_value(execute_data, config_node->param, true);
+    arg_value = sp_get_var_value(execute_data, config_node->param, true);
 
     if (arg_value) {
       *arg_value_str = sp_convert_to_string(arg_value);
diff --git a/src/sp_var_parser.c b/src/sp_var_parser.c
index ab36677..8e5bdb1 100644
--- a/src/sp_var_parser.c
+++ b/src/sp_var_parser.c
@@ -74,7 +74,7 @@ static int create_var(sp_tree *tree, const char *restrict value,
     sp_log_err("config", "Invalid var name: %s.", var_node->value);
     return -1;
   }
-  var_node->idx = parse_var(idx);
+  var_node->idx = sp_parse_var(idx);
 
   if (tree != var_node) {
     while (tree->next) {
@@ -222,7 +222,7 @@ static sp_tree *parse_tokens(const char *restrict str,
   return tree;
 }
 
-sp_tree *parse_var(const char *line) {
+sp_tree *sp_parse_var(const char *line) {
   sp_list_node *tokens_list = NULL;
   sp_tree *tree = NULL;
   const sp_conf_token delimiter_list[] = {
diff --git a/src/sp_var_parser.h b/src/sp_var_parser.h
index 4a26e58..6d53691 100644
--- a/src/sp_var_parser.h
+++ b/src/sp_var_parser.h
@@ -8,8 +8,8 @@ typedef struct sp_token_s {
   size_t pos;
 } sp_conf_token;
 
-zval *get_value(zend_execute_data *, const sp_tree *, bool);
-sp_tree *parse_var(const char *);
+zval *sp_get_var_value(zend_execute_data *, const sp_tree *, bool);
+sp_tree *sp_parse_var(const char *);
 
 #define OBJECT_TOKEN "->"
 #define ARRAY_TOKEN "["
diff --git a/src/sp_var_value.c b/src/sp_var_value.c
index 05598bf..68fd47c 100644
--- a/src/sp_var_value.c
+++ b/src/sp_var_value.c
@@ -100,7 +100,7 @@ static void *get_entry_hashtable(const HashTable *ht, const char *entry,
 
 static zval *get_array_value(zend_execute_data *ed, zval *zvalue,
                              const sp_tree *tree) {
-  zval *idx_value = get_value(ed, tree->idx, false);
+  zval *idx_value = sp_get_var_value(ed, tree->idx, false);
 
   if (!zvalue || !idx_value) {
     return NULL;
@@ -177,7 +177,7 @@ static zval *get_unknown_type(const char *restrict value, zval *zvalue,
   return zvalue;
 }
 
-zval *get_value(zend_execute_data *ed, const sp_tree *tree, bool is_param) {
+zval *sp_get_var_value(zend_execute_data *ed, const sp_tree *tree, bool is_param) {
   zval *zvalue = NULL;
   zend_class_entry *ce = NULL;
 
-- 
cgit v1.3