From 4e98405c80d80b21f23b133f92f79b23aaac6bad Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Thu, 12 Oct 2017 01:04:59 +0200
Subject: Fix minor gcc warnings with experimental options

`CFLAGS='-Wnull-dereference -Wlogical-op -Wshadow -Wjump-misses-init' make clean coverage`
---
 src/sp_config_keywords.c    | 6 +++---
 src/sp_disabled_functions.c | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index e71463a..5e31c41 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -40,7 +40,7 @@ static int get_construct_type(sp_disabled_function const *const df) {
       } else if (df->r_function) {
         if (true == is_regexp_matching(df->r_function, mapping[i].keys[j])) {
           return mapping[i].type;
-        } 
+        }
       }
     }
   }
@@ -96,13 +96,13 @@ int parse_readonly_exec(char *line) {
 }
 
 int parse_global(char *line) {
-  sp_config_functions sp_config_global[] = {
+  sp_config_functions sp_config_funcs_global[] = {
       {parse_str, SP_TOKEN_ENCRYPTION_KEY,
        &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->encryption_key)},
       {parse_str, SP_TOKEN_ENV_VAR,
        &(SNUFFLEUPAGUS_G(config).config_snuffleupagus->cookies_env_var)},
       {0}};
-  return parse_keywords(sp_config_global, line);
+  return parse_keywords(sp_config_funcs_global, line);
 }
 
 int parse_cookie_encryption(char *line) {
diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c
index c073b79..4ddb4af 100644
--- a/src/sp_disabled_functions.c
+++ b/src/sp_disabled_functions.c
@@ -274,6 +274,7 @@ static bool should_drop_on_ret(zval* return_value,
   char* complete_path_function = get_complete_function_path(execute_data);
   const char* current_filename = zend_get_executed_filename(TSRMLS_C);
   char current_file_hash[SHA256_SIZE * 2] = {0};
+  bool match_type = false, match_value = false;
 
   if (!complete_path_function) {
     return false;
@@ -325,13 +326,13 @@ static bool should_drop_on_ret(zval* return_value,
 
     ret_value_str = sp_convert_to_string(return_value);
 
-    bool match_type = (config_node->ret_type) &&
+    match_type = (config_node->ret_type) &&
                       (config_node->ret_type == Z_TYPE_P(return_value));
-    bool match_value = (config_node->ret || config_node->r_ret) &&
+    match_value = (config_node->ret || config_node->r_ret) &&
                        (true == sp_match_value(ret_value_str, config_node->ret,
                                                config_node->r_ret));
 
-    if (true == match_type || match_value) {
+    if (true == match_type || true == match_value) {
       if (true == config_node->allow) {
         efree(complete_path_function);
         efree(ret_value_str);
-- 
cgit v1.3