From b213c8e08b5624da9bb69dd05e132e247bab3082 Mon Sep 17 00:00:00 2001
From: simon MAGNIN-FEYSOT
Date: Wed, 17 Jan 2018 19:25:08 +0100
Subject: Remove useless "head" member in our linked lists implementation

This should close #85 ---
 src/sp_config_keywords.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/sp_config_keywords.c')

diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index 135868b..93c3da9 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -102,7 +102,7 @@ int parse_global(char *line) {
   return parse_keywords(sp_config_funcs_global, line);
 }
 
-static int parse_eval_filter_conf(char *line, sp_list_node *list) {
+static int parse_eval_filter_conf(char *line, sp_list_node **list) {
   char *token;
   char *rest;
   sp_config_functions sp_config_funcs[] = {
@@ -116,19 +116,19 @@ static int parse_eval_filter_conf(char *line, sp_list_node *list) {
   }
 
   while ((token = strtok_r(rest, ",", &rest))) {
-    sp_list_insert(list, token);
+    *list = sp_list_insert(*list, token);
   }
   return SUCCESS;
 }
 
 int parse_eval_blacklist(char *line) {
   return parse_eval_filter_conf(line,
-                                SNUFFLEUPAGUS_G(config).config_eval->blacklist);
+                                &SNUFFLEUPAGUS_G(config).config_eval->blacklist);
 }
 
 int parse_eval_whitelist(char *line) {
   return parse_eval_filter_conf(line,
-                                SNUFFLEUPAGUS_G(config).config_eval->whitelist);
+                                &SNUFFLEUPAGUS_G(config).config_eval->whitelist);
 }
 
 int parse_cookie(char *line) {
@@ -204,7 +204,8 @@ int parse_cookie(char *line) {
       return -1;
     }
   }
-  sp_list_insert(SNUFFLEUPAGUS_G(config).config_cookie->cookies, cookie);
+  SNUFFLEUPAGUS_G(config).config_cookie->cookies = sp_list_insert(
+      SNUFFLEUPAGUS_G(config).config_cookie->cookies, cookie);
   return SUCCESS;
 }
 
@@ -371,12 +372,12 @@ int parse_disabled_functions(char *line) {
 
   switch (get_construct_type(df)) {
     case ZEND_INCLUDE_OR_EVAL:
-      sp_list_insert(
+      SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_include = sp_list_insert(
           SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_include,
           df);
       return ret;
     case ZEND_EVAL_CODE:
-      sp_list_insert(
+      SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_eval = sp_list_insert(
           SNUFFLEUPAGUS_G(config).config_disabled_constructs->construct_eval,
           df);
       return ret;
@@ -390,11 +391,11 @@ int parse_disabled_functions(char *line) {
   }
 
   if (df->ret || df->r_ret || df->ret_type) {
-    sp_list_insert(SNUFFLEUPAGUS_G(config)
-                       .config_disabled_functions_ret->disabled_functions,
-                   df);
+    SNUFFLEUPAGUS_G(config).config_disabled_functions_ret->disabled_functions = sp_list_insert(
+        SNUFFLEUPAGUS_G(config).config_disabled_functions_ret->disabled_functions,
+        df);
   } else {
-    sp_list_insert(
+    SNUFFLEUPAGUS_G(config).config_disabled_functions->disabled_functions = sp_list_insert(
         SNUFFLEUPAGUS_G(config).config_disabled_functions->disabled_functions,
         df);
   }
-- 
cgit v1.3