diff options
| -rw-r--r-- | include/expression.h | 3 | ||||
| -rw-r--r-- | src/rule.c | 2 | ||||
| -rw-r--r-- | src/segtree.c | 15 |
3 files changed, 11 insertions, 9 deletions
diff --git a/include/expression.h b/include/expression.h index 72b6f69b..62a1e517 100644 --- a/include/expression.h +++ b/include/expression.h @@ -364,7 +364,8 @@ extern struct expr *concat_expr_alloc(const struct location *loc); extern struct expr *list_expr_alloc(const struct location *loc); extern struct expr *set_expr_alloc(const struct location *loc); -extern int set_to_intervals(struct list_head *msgs, struct set *set); +extern int set_to_intervals(struct list_head *msgs, struct set *set, + struct expr *init); extern struct expr *mapping_expr_alloc(const struct location *loc, struct expr *from, struct expr *to); @@ -889,7 +889,7 @@ static int do_add_set(struct netlink_ctx *ctx, const struct handle *h, return -1; if (set->init != NULL) { if (set->flags & SET_F_INTERVAL && - set_to_intervals(ctx->msgs, set) < 0) + set_to_intervals(ctx->msgs, set, set->init) < 0) return -1; if (do_add_setelems(ctx, &set->handle, set->init) < 0) return -1; diff --git a/src/segtree.c b/src/segtree.c index d8f98faa..c0a8c289 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -64,11 +64,12 @@ struct elementary_interval { struct expr *expr; }; -static void seg_tree_init(struct seg_tree *tree, const struct set *set) +static void seg_tree_init(struct seg_tree *tree, const struct set *set, + struct expr *init) { struct expr *first; - first = list_entry(set->init->expressions.next, struct expr, list); + first = list_entry(init->expressions.next, struct expr, list); tree->root = RB_ROOT; tree->keytype = set->keytype; tree->keylen = set->keylen; @@ -431,14 +432,14 @@ static void set_insert_interval(struct expr *set, struct seg_tree *tree, compound_expr_add(set, expr); } -int set_to_intervals(struct list_head *errs, struct set *set) +int set_to_intervals(struct list_head *errs, struct set *set, struct expr *init) { struct elementary_interval *ei, *next; struct seg_tree tree; LIST_HEAD(list); - seg_tree_init(&tree, set); - if (set_to_segtree(errs, set->init, &tree) < 0) + seg_tree_init(&tree, set, init); + if (set_to_segtree(errs, init, &tree) < 0) return -1; segtree_linearize(&list, &tree); @@ -448,12 +449,12 @@ int set_to_intervals(struct list_head *errs, struct set *set) 2 * tree.keylen / BITS_PER_BYTE, ei->left, 2 * tree.keylen / BITS_PER_BYTE, ei->right); } - set_insert_interval(set->init, &tree, ei); + set_insert_interval(init, &tree, ei); ei_destroy(ei); } if (segtree_debug()) { - expr_print(set->init); + expr_print(init); pr_gmp_debug("\n"); } return 0; |