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_var_parser.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/sp_var_parser.c') diff --git a/src/sp_var_parser.c b/src/sp_var_parser.c index 55cbfc2..d0ae67c 100644 --- a/src/sp_var_parser.c +++ b/src/sp_var_parser.c @@ -1,6 +1,6 @@ #include "php_snuffleupagus.h" -static int parse_str_tokens(const char *str, const sp_conf_token token, +static sp_list_node *parse_str_tokens(const char *str, const sp_conf_token token, sp_list_node *tokens_list) { const char *cur_str = str; @@ -10,13 +10,13 @@ static int parse_str_tokens(const char *str, const sp_conf_token token, token_elm->pos = cur_str - str; token_elm->text_repr = token.text_repr; token_elm->type = token.type; - sp_list_insert(tokens_list, token_elm); + tokens_list = sp_list_insert(tokens_list, token_elm); cur_str += strlen(token.text_repr); } else { cur_str++; } } - return 0; + return tokens_list; } static bool is_var_name_valid(const char *name) { @@ -240,10 +240,9 @@ sp_tree *parse_var(const char *line) { if (!line) { return NULL; } - tokens_list = sp_list_new(); for (unsigned int i = 0; i < sizeof(delimiter_list) / sizeof(sp_conf_token); i++) { - parse_str_tokens(line, delimiter_list[i], tokens_list); + tokens_list = parse_str_tokens(line, delimiter_list[i], tokens_list); } tokens_list = sp_list_sort(tokens_list, cmp_tokens); tree = parse_tokens(line, tokens_list); -- cgit v1.3