diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-04-22 18:05:26 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-04-27 12:31:58 +0200 |
| commit | 4cee1339c61da246aa7b385457318eba88c4a28a (patch) | |
| tree | 4bbaf803e9d7bb9efe16dd70f87a0e69eb20f514 /src | |
| parent | a6df2f0654bdb9c413191b3dee0fd749e64cb8d7 (diff) | |
segtree: rename set expression set_to_segtree()
This function is modified by a follow up patch to take the set object,
so rename it to init.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/segtree.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/segtree.c b/src/segtree.c index 88bb3a25..8ac05466 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -327,16 +327,16 @@ static unsigned int expr_to_intervals(const struct expr *set, return n; } -static int set_to_segtree(struct list_head *msgs, struct expr *set, +static int set_to_segtree(struct list_head *msgs, struct expr *init, struct seg_tree *tree) { - struct elementary_interval *intervals[set->size]; + struct elementary_interval *intervals[init->size]; struct expr *i, *next; unsigned int n; - n = expr_to_intervals(set, tree->keylen, intervals); + n = expr_to_intervals(init, tree->keylen, intervals); - list_for_each_entry_safe(i, next, &set->expressions, list) { + list_for_each_entry_safe(i, next, &init->expressions, list) { list_del(&i->list); expr_free(i); } @@ -349,9 +349,9 @@ static int set_to_segtree(struct list_head *msgs, struct expr *set, /* * Insert elements into tree */ - for (n = 0; n < set->size; n++) { - if (set->set_flags & SET_F_MAP && - n < set->size - 1 && + for (n = 0; n < init->size; n++) { + if (init->set_flags & SET_F_MAP && + n < init->size - 1 && interval_conflict(intervals[n], intervals[n+1])) return expr_binary_error(msgs, intervals[n]->expr, |