intervals: add helper function to set previous element

Add helper function to set previous element during the automerge
iteration. No functional changes are intended.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/intervals.c b/src/intervals.c
index 12cccbdab752f18071aa7edb5b64fa5651fdcfe6..44fdda36e35fbcc2cebabfa6a188a04b2011c2c1 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -148,6 +148,14 @@ static void set_sort_splice(struct expr *init, struct set *set)
        }
 }
 
+static void set_prev_elem(struct expr **prev, struct expr *i,
+                         struct range *prev_range, struct range *range)
+{
+       *prev = i;
+       mpz_set(prev_range->low, range->low);
+       mpz_set(prev_range->high, range->high);
+}
+
 static void setelem_automerge(struct set_automerge_ctx *ctx)
 {
        struct expr *i, *next, *prev = NULL;
@@ -168,9 +176,7 @@ static void setelem_automerge(struct set_automerge_ctx *ctx)
                range_expr_value_high(range.high, i);
 
                if (!prev) {
-                       prev = i;
-                       mpz_set(prev_range.low, range.low);
-                       mpz_set(prev_range.high, range.high);
+                       set_prev_elem(&prev, i, &prev_range, &range);
                        continue;
                }
 
@@ -192,9 +198,7 @@ static void setelem_automerge(struct set_automerge_ctx *ctx)
                        }
                }
 
-               prev = i;
-               mpz_set(prev_range.low, range.low);
-               mpz_set(prev_range.high, range.high);
+               set_prev_elem(&prev, i, &prev_range, &range);
        }
 
        mpz_clear(prev_range.low);