diff options
| author | jvoisin | 2022-03-20 18:20:45 +0100 |
|---|---|---|
| committer | jvoisin | 2022-03-20 18:20:45 +0100 |
| commit | 81dd7f2ef07af306fe83d7755cbac4529aa9fc8d (patch) | |
| tree | 32cc44c6231b30db5ac7b15699297863460784aa /src/sp_var_parser.c | |
| parent | 83b01942dfc80474cc05e09aeef4b44307a7120b (diff) | |
| parent | c38df1077a6c1dfbca1baca049214d053e2e7684 (diff) | |
Merge remote-tracking branch 'sektioneins/master'
Diffstat (limited to 'src/sp_var_parser.c')
| -rw-r--r-- | src/sp_var_parser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp_var_parser.c b/src/sp_var_parser.c index ea856f6..2639991 100644 --- a/src/sp_var_parser.c +++ b/src/sp_var_parser.c | |||
| @@ -33,8 +33,8 @@ static bool is_var_name_valid(const char *const name) { | |||
| 33 | if (NULL == regexp_var || NULL == regexp_const) { | 33 | if (NULL == regexp_var || NULL == regexp_const) { |
| 34 | return false; // LCOV_EXCL_LINE | 34 | return false; // LCOV_EXCL_LINE |
| 35 | } | 35 | } |
| 36 | if ((false == sp_is_regexp_matching(regexp_var, name)) && | 36 | if ((false == sp_is_regexp_matching_len(regexp_var, VAR_AND_LEN(name))) && |
| 37 | (false == sp_is_regexp_matching(regexp_const, name))) { | 37 | (false == sp_is_regexp_matching_len(regexp_const, VAR_AND_LEN(name)))) { |
| 38 | return false; | 38 | return false; |
| 39 | } | 39 | } |
| 40 | return true; | 40 | return true; |
| @@ -264,7 +264,7 @@ sp_tree *sp_parse_var(const char *line) { | |||
| 264 | } | 264 | } |
| 265 | tokens_list = sp_list_sort(tokens_list, cmp_tokens); | 265 | tokens_list = sp_list_sort(tokens_list, cmp_tokens); |
| 266 | tree = parse_tokens(line, tokens_list); | 266 | tree = parse_tokens(line, tokens_list); |
| 267 | sp_list_free(tokens_list); | 267 | sp_list_free2(tokens_list); |
| 268 | // Check if tree is empty. | 268 | // Check if tree is empty. |
| 269 | if (tree && tree->next == NULL && tree->type == UNDEFINED) { | 269 | if (tree && tree->next == NULL && tree->type == UNDEFINED) { |
| 270 | tree->type = CONSTANT; | 270 | tree->type = CONSTANT; |
