From cbeb5df0a202f07e84db32d4015026b3d3f3c892 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 6 Mar 2014 16:26:09 +0100 Subject: set: abort on interval conflicts We currently print a debug message (with debugging) and continue. Output a proper error message and abort. While at it, make sure we only report a conflict if there actually is one. This is not the case similar actions, IOW in case of sets, never, in case of maps, only if the mapping differs. Signed-off-by: Patrick McHardy --- include/expression.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/expression.h') diff --git a/include/expression.h b/include/expression.h index d974131e..edb6dc50 100644 --- a/include/expression.h +++ b/include/expression.h @@ -341,7 +341,7 @@ 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 void set_to_intervals(struct set *set); +extern int set_to_intervals(struct list_head *msgs, struct set *set); extern struct expr *mapping_expr_alloc(const struct location *loc, struct expr *from, struct expr *to); -- cgit v1.2.3